850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from
SLE12-SP3 to SLE15, re-order all patches.
- Rename the following patches, they are deleted and re-add in next
part of patches
0001-Generic-support-for-consistency-policy-and-PPL.patch
0002-Detail-show-consistency-policy.patch
0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
0003-imsm-PPL-support.patch
0004-super1-PPL-support.patch
0005-Add-ppl-and-no-ppl-options-for-update.patch
0006-Grow-support-consistency-policy-change.patch
0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch
0008-Retry-HOT_REMOVE_DISK-a-few-times.patch
0009-Introduce-sys_hot_remove_disk.patch
0010-Add-force-flag-to-hot_remove_disk.patch
0011-Detail-handle-non-existent-arrays-better.patch
- Synchronize patches from mdadm of SLE12-SP3, the above renamed
patches are re-add here,
0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch
0002-imsm-fix-missing-error-message-during-migration.patch
0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch
0004-mdadm-check-the-nodes-when-operate-clustered-array.patch
0005-examine-tidy-up-some-code.patch
0006-mdadm-add-man-page-for-symlinks.patch
0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch
0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
0009-mdadm-Specify-enough-length-when-write-to-buffer.patch
0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch
0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch
0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
OBS-URL: https://build.opensuse.org/request/show/517978
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
84 lines
3.3 KiB
Diff
84 lines
3.3 KiB
Diff
From 853375734edcfd70ba64b444b9e69f7e336a30b7 Mon Sep 17 00:00:00 2001
|
|
From: Alexey Obitotskiy <aleksey.obitotskiy@intel.com>
|
|
Date: Tue, 9 May 2017 12:25:44 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
super-intel.c | 21 +++++++++++----------
|
|
1 file changed, 11 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index 2a5d848..cfb10d5 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;
|
|
--
|
|
2.12.0
|
|
|