From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751336AbdCQQrX (ORCPT ); Fri, 17 Mar 2017 12:47:23 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:38465 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175AbdCQQrV (ORCPT ); Fri, 17 Mar 2017 12:47:21 -0400 From: Gioh Kim To: jes.sorensen@gmail.com Cc: neilb@suse.com, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, Gioh Kim , Jack Wang Subject: [PATCH 1/2] super1: ignore failfast flag for setting device role Date: Fri, 17 Mar 2017 17:47:01 +0100 Message-Id: <1489769222-31855-2-git-send-email-gi-oh.kim@profitbricks.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1489769222-31855-1-git-send-email-gi-oh.kim@profitbricks.com> References: <1489769222-31855-1-git-send-email-gi-oh.kim@profitbricks.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- super1.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/super1.c b/super1.c index 882cd61..1da33ef 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 &= ~(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.5.0