diff options
| author | Alexey Obitotskiy <aleksey.obitotskiy@intel.com> | 2017-05-09 12:25:44 +0200 |
|---|---|---|
| committer | Jes Sorensen <jsorensen@fb.com> | 2017-05-09 20:18:33 +0200 |
| commit | 853375734edcfd70ba64b444b9e69f7e336a30b7 (patch) | |
| tree | e73dfdbee90c6b52f9fd0b1027a7bc1b9d1c0bf6 | |
| parent | imsm: allow drives in a container regardless of sector size (diff) | |
| download | mdadm-853375734edcfd70ba64b444b9e69f7e336a30b7.tar.xz mdadm-853375734edcfd70ba64b444b9e69f7e336a30b7.zip | |
imsm: allocate buffer to support maximum sector size
Allocate migration record buffer to support maximum sector size. Disk with
non-matching sector size is not going to be included in the array, however
some preparation/cleanup actions still take place on it and they would
cause a crash. Clear migration record using sector size of the disk (not
array) as they might not match.
Signed-off-by: Alexey Obitotskiy <aleksey.obitotskiy@intel.com>
Signed-off-by: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
| -rw-r--r-- | super-intel.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/super-intel.c b/super-intel.c index 2a5d848f..cfb10d59 100644 --- a/super-intel.c +++ b/super-intel.c @@ -4229,8 +4229,8 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname) sectors = mpb_sectors(anchor, sector_size) - 1; free(anchor); - if (posix_memalign(&super->migr_rec_buf, sector_size, - MIGR_REC_BUF_SECTORS*sector_size) != 0) { + if (posix_memalign(&super->migr_rec_buf, MAX_SECTOR_SIZE, + MIGR_REC_BUF_SECTORS*MAX_SECTOR_SIZE) != 0) { pr_err("could not allocate migr_rec buffer\n"); free(super->buf); return 2; @@ -5258,8 +5258,9 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info, pr_err("could not allocate new mpb\n"); return 0; } - if (posix_memalign(&super->migr_rec_buf, sector_size, - MIGR_REC_BUF_SECTORS*sector_size) != 0) { + if (posix_memalign(&super->migr_rec_buf, MAX_SECTOR_SIZE, + MIGR_REC_BUF_SECTORS* + MAX_SECTOR_SIZE) != 0) { pr_err("could not allocate migr_rec buffer\n"); free(super->buf); free(super); @@ -5719,12 +5720,12 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk, } /* clear migr_rec when adding disk to container */ - memset(super->migr_rec_buf, 0, MIGR_REC_BUF_SECTORS*super->sector_size); - if (lseek64(fd, size - MIGR_REC_SECTOR_POSITION*super->sector_size, + memset(super->migr_rec_buf, 0, MIGR_REC_BUF_SECTORS*MAX_SECTOR_SIZE); + if (lseek64(fd, size - MIGR_REC_SECTOR_POSITION*member_sector_size, SEEK_SET) >= 0) { if ((unsigned int)write(fd, super->migr_rec_buf, - MIGR_REC_BUF_SECTORS*super->sector_size) != - MIGR_REC_BUF_SECTORS*super->sector_size) + MIGR_REC_BUF_SECTORS*member_sector_size) != + MIGR_REC_BUF_SECTORS*member_sector_size) perror("Write migr_rec failed"); } @@ -5916,7 +5917,7 @@ static int write_super_imsm(struct supertype *st, int doclose) } if (clear_migration_record) memset(super->migr_rec_buf, 0, - MIGR_REC_BUF_SECTORS*sector_size); + MIGR_REC_BUF_SECTORS*MAX_SECTOR_SIZE); if (sector_size == 4096) convert_to_4k(super); @@ -11770,7 +11771,7 @@ static int imsm_manage_reshape( /* clear migr_rec on disks after successful migration */ struct dl *d; - memset(super->migr_rec_buf, 0, MIGR_REC_BUF_SECTORS*sector_size); + memset(super->migr_rec_buf, 0, MIGR_REC_BUF_SECTORS*MAX_SECTOR_SIZE); for (d = super->disks; d; d = d->next) { if (d->index < 0 || is_failed(&d->disk)) continue; |