From: Greg Kroah-Hartman Date: Mon, 12 Nov 2018 02:33:08 +0000 (-0800) Subject: drop 3.18 patch X-Git-Tag: v4.19.2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02a1790a1d0fac2d9d67de3802fb0c55c528877b;p=thirdparty%2Fkernel%2Fstable-queue.git drop 3.18 patch --- diff --git a/queue-3.18/md-fix-invalid-stored-role-for-a-disk.patch b/queue-3.18/md-fix-invalid-stored-role-for-a-disk.patch deleted file mode 100644 index ae44b19a2a1..00000000000 --- a/queue-3.18/md-fix-invalid-stored-role-for-a-disk.patch +++ /dev/null @@ -1,43 +0,0 @@ -From foo@baz Sat Nov 10 11:35:28 PST 2018 -From: Shaohua Li -Date: Mon, 1 Oct 2018 18:36:36 -0700 -Subject: MD: fix invalid stored role for a disk - -From: Shaohua Li - -[ Upstream commit d595567dc4f0c1d90685ec1e2e296e2cad2643ac ] - -If we change the number of array's device after device is removed from array, -then add the device back to array, we can see that device is added as active -role instead of spare which we expected. - -Please see the below link for details: -https://marc.info/?l=linux-raid&m=153736982015076&w=2 - -This is caused by that we prefer to use device's previous role which is -recorded by saved_raid_disk, but we should respect the new number of -conf->raid_disks since it could be changed after device is removed. - -Reported-by: Gioh Kim -Tested-by: Gioh Kim -Acked-by: Guoqing Jiang -Signed-off-by: Shaohua Li -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/md/md.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/md/md.c -+++ b/drivers/md/md.c -@@ -1646,6 +1646,10 @@ static int super_1_validate(struct mddev - } else - set_bit(In_sync, &rdev->flags); - rdev->raid_disk = role; -+ if (role >= mddev->raid_disks) { -+ rdev->saved_raid_disk = -1; -+ rdev->raid_disk = -1; -+ } - break; - } - if (sb->devflags & WriteMostly1) diff --git a/queue-3.18/series b/queue-3.18/series index 267e043660a..2a2f825c832 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -22,7 +22,6 @@ kprobes-return-error-if-we-fail-to-reuse-kprobe-instead-of-bug_on.patch ath10k-schedule-hardware-restart-if-wmi-command-times-out.patch scsi-esp_scsi-track-residual-for-pio-transfers.patch ext4-fix-argument-checking-in-ext4_ioc_move_ext.patch -md-fix-invalid-stored-role-for-a-disk.patch usb-chipidea-prevent-unbalanced-irq-disable.patch uio-ensure-class-is-registered-before-devices.patch scsi-lpfc-correct-soft-lockup-when-running-mds-diagnostics.patch