Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Koutný <mkoutny@suse.com>2019-01-10 17:22:36 +0100
committerMichal Koutný <mkoutny@suse.com>2019-01-14 19:22:07 +0100
commitcb923498977d02b25959c2e45ce3e7756dfc7958 (patch)
treec05dd9194ac965c905b6d5d1b0b28327a5bf599e
parent426d1c9ee7cdcf4fe5729d239c06449e41871b5c (diff)
md: reorder flag_bits to match upstream commits
The ordering in the patches was backward.
-rw-r--r--patches.suse/0002-md-cluster-remove-a-disk-asynchronously-from-cluster.patch10
-rw-r--r--patches.suse/md-expedite-hot-remove10
2 files changed, 10 insertions, 10 deletions
diff --git a/patches.suse/0002-md-cluster-remove-a-disk-asynchronously-from-cluster.patch b/patches.suse/0002-md-cluster-remove-a-disk-asynchronously-from-cluster.patch
index baf4cf7b1e..c278f7d639 100644
--- a/patches.suse/0002-md-cluster-remove-a-disk-asynchronously-from-cluster.patch
+++ b/patches.suse/0002-md-cluster-remove-a-disk-asynchronously-from-cluster.patch
@@ -71,13 +71,13 @@ index 8f3dd3a..792854e 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -180,6 +180,7 @@ enum flag_bits {
- * so it is save to remove without
- * another call.
+ * Usually, this device should be faster
+ * than other devices in the array
*/
+ ClusterRemove,
- };
-
- static inline int is_badblock(struct md_rdev *rdev, sector_t s, int sectors,
+ RemoveSynchronised, /* synchronize_rcu was called after
+ * This device was known to be faulty,
+ * so it is save to remove without
--
2.6.2
diff --git a/patches.suse/md-expedite-hot-remove b/patches.suse/md-expedite-hot-remove
index 070d30114f..9f03cea89e 100644
--- a/patches.suse/md-expedite-hot-remove
+++ b/patches.suse/md-expedite-hot-remove
@@ -66,17 +66,17 @@ Signed-off-by: Neil Brown <neilb@suse.de>
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -196,6 +196,11 @@ enum flag_bits {
- Timeout, /* Device fault due to timeout.
- * 'Faulty' is required to be set.
+ * Usually, this device should be faster
+ * than other devices in the array
*/
+ RemoveSynchronised, /* synchronize_rcu was called after
+ * This device was known to be faulty,
+ * so it is save to remove without
+ * another call.
+ */
- };
-
- #define BB_LEN_MASK (0x00000000000001FFULL)
+ FailFast, /* Minimal retries should be attempted on
+ * this device, so use REQ_FAILFAST_DEV.
+ * Also don't try to repair failed reads.
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1845,7 +1845,8 @@ static int raid10_remove_disk(struct mdd