From e23c2663da73f905aa5fa9800feda3d08a8026ee Mon Sep 17 00:00:00 2001 From: Gioh Kim Date: Mon, 20 Mar 2017 10:51:56 +0100 Subject: [RHEL7.5 PATCH 017/169] super1: ignore failfast flag for setting device role There is corner case for setting device role, if new device has failfast flag. The failfast flag should be ignored. Signed-off-by: Gioh Kim Signed-off-by: Jack Wang Signed-off-by: Jes Sorensen --- super1.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/super1.c b/super1.c index 882cd61..f3520ac 100644 --- a/super1.c +++ b/super1.c @@ -1491,6 +1491,7 @@ static int add_to_super1(struct supertype *st, mdu_disk_info_t *dk, struct devinfo *di, **dip; bitmap_super_t *bms = (bitmap_super_t*)(((char*)sb) + MAX_SB_SIZE); int rv, lockid; + int dk_state; if (bms->version == BITMAP_MAJOR_CLUSTERED && dlm_funs_ready()) { rv = cluster_get_dlmlock(&lockid); @@ -1501,11 +1502,12 @@ static int add_to_super1(struct supertype *st, mdu_disk_info_t *dk, } } - if ((dk->state & 6) == 6) /* active, sync */ + dk_state = dk->state & ~(1<raid_disk); - else if (dk->state & (1<state & ~2) == 0) /* active or idle -> spare */ + else if ((dk_state & ~2) == 0) /* active or idle -> spare */ *rp = MD_DISK_ROLE_SPARE; else *rp = MD_DISK_ROLE_FAULTY; -- 2.7.4