lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 29 Mar 2017 11:40:33 +0200 From: Gioh Kim <gi-oh.kim@...fitbricks.com> To: jes.sorensen@...il.com Cc: neilb@...e.com, linux-raid@...r.kernel.org, linux-kernel@...r.kernel.org, Gioh Kim <gi-oh.kim@...fitbricks.com> Subject: [PATCH 1/2] super1: replace hard-coded values with bit definitions Some hard-coded values for disk status are replaced with bit definitions. Signed-off-by: Gioh Kim <gi-oh.kim@...fitbricks.com> --- super1.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/super1.c b/super1.c index f3520ac..e8b9f61 100644 --- a/super1.c +++ b/super1.c @@ -1010,7 +1010,7 @@ static void getinfo_super1(struct supertype *st, struct mdinfo *info, char *map) info->disk.state = 0; /* spare: not active, not sync, not faulty */ break; case MD_DISK_ROLE_FAULTY: - info->disk.state = 1; /* faulty */ + info->disk.state = (1 << MD_DISK_FAULTY); /* faulty */ break; case MD_DISK_ROLE_JOURNAL: info->disk.state = (1 << MD_DISK_JOURNAL); @@ -1503,11 +1503,12 @@ static int add_to_super1(struct supertype *st, mdu_disk_info_t *dk, } dk_state = dk->state & ~(1<<MD_DISK_FAILFAST); - if ((dk_state & 6) == 6) /* active, sync */ + if ((dk_state & (1<<MD_DISK_ACTIVE)) && + (dk_state & (1<<MD_DISK_SYNC)))/* active, sync */ *rp = __cpu_to_le16(dk->raid_disk); else if (dk_state & (1<<MD_DISK_JOURNAL)) *rp = MD_DISK_ROLE_JOURNAL; - else if ((dk_state & ~2) == 0) /* active or idle -> spare */ + else if ((dk_state & ~(1<<MD_DISK_ACTIVE)) == 0) /* active or idle -> spare */ *rp = MD_DISK_ROLE_SPARE; else *rp = MD_DISK_ROLE_FAULTY; -- 2.5.0
Powered by blists - more mailing lists