Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mdadm: Fix '==' broken formatting 

Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
Jes Sorensen 2017-05-16 14:04:22 -04:00
parent d7be7d8736
commit b831b299e8
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Detail.c
View File

@ -714,9 +714,9 @@ This is pretty boring
if (disk.state & (1 << MD_DISK_JOURNAL)) if (disk.state & (1 << MD_DISK_JOURNAL))
printf(" journal"); printf(" journal");
if ((disk.state & if ((disk.state &
((1<<MD_DISK_ACTIVE)|(1<<MD_DISK_SYNC) ((1 << MD_DISK_ACTIVE) | (1 << MD_DISK_SYNC) |
|(1<<MD_DISK_REMOVED)|(1<<MD_DISK_FAULTY)|(1<<MD_DISK_JOURNAL))) (1 << MD_DISK_REMOVED) | (1 << MD_DISK_FAULTY) |
== 0) { (1 << MD_DISK_JOURNAL))) == 0) {
printf(" spare"); printf(" spare");
if (disk.raid_disk < array.raid_disks && if (disk.raid_disk < array.raid_disks &&
disk.raid_disk >= 0) disk.raid_disk >= 0)

4
config.c
View File

@ -1118,8 +1118,8 @@ struct mddev_ident *conf_match(struct supertype *st,
match = NULL; match = NULL;
for (; array_list; array_list = array_list->next) { for (; array_list; array_list = array_list->next) {
if (array_list->uuid_set && if (array_list->uuid_set &&
same_uuid(array_list->uuid, info->uuid, st->ss->swapuuid) same_uuid(array_list->uuid, info->uuid,
== 0) { st->ss->swapuuid) == 0) {
if (verbose >= 2 && array_list->devname) if (verbose >= 2 && array_list->devname)
pr_err("UUID differs from %s.\n", pr_err("UUID differs from %s.\n",
array_list->devname); array_list->devname);

4
managemon.c
View File

@ -580,8 +580,8 @@ static void manage_member(struct mdstat_ent *mdstat,
usleep(15*1000); usleep(15*1000);
} }
replace_array(container, a, newa); replace_array(container, a, newa);
if (sysfs_set_str(&a->info, NULL, "sync_action", "recover") if (sysfs_set_str(&a->info, NULL,
== 0) "sync_action", "recover") == 0)
newa->prev_action = recover; newa->prev_action = recover;
dprintf("recovery started on %s\n", a->info.sys_name); dprintf("recovery started on %s\n", a->info.sys_name);
out: out:

16
super-ddf.c
View File

@ -1883,8 +1883,8 @@ static struct vd_config *find_vdcr(struct ddf_super *ddf, unsigned int inst,
nsec = n / be16_to_cpu(conf->prim_elmnt_count); nsec = n / be16_to_cpu(conf->prim_elmnt_count);
if (conf->sec_elmnt_seq != nsec) { if (conf->sec_elmnt_seq != nsec) {
for (ibvd = 1; ibvd < conf->sec_elmnt_count; ibvd++) { for (ibvd = 1; ibvd < conf->sec_elmnt_count; ibvd++) {
if (v->other_bvds[ibvd-1]->sec_elmnt_seq if (v->other_bvds[ibvd-1]->sec_elmnt_seq ==
== nsec) nsec)
break; break;
} }
if (ibvd == conf->sec_elmnt_count) if (ibvd == conf->sec_elmnt_count)
@ -3814,13 +3814,13 @@ static struct mdinfo *container_content_ddf(struct supertype *st, char *subarray
unsigned int iphys; unsigned int iphys;
int stt; int stt;
if (be32_to_cpu(ddf->phys->entries[pd].refnum) if (be32_to_cpu(ddf->phys->entries[pd].refnum) ==
== 0xFFFFFFFF) 0xffffffff)
continue; continue;
stt = be16_to_cpu(ddf->phys->entries[pd].state); stt = be16_to_cpu(ddf->phys->entries[pd].state);
if ((stt & (DDF_Online|DDF_Failed|DDF_Rebuilding)) if ((stt & (DDF_Online|DDF_Failed|DDF_Rebuilding)) !=
!= DDF_Online) DDF_Online)
continue; continue;
i = get_pd_index_from_refnum( i = get_pd_index_from_refnum(
@ -4205,8 +4205,8 @@ static int get_bvd_state(const struct ddf_super *ddf,
if (pd < 0) if (pd < 0)
continue; continue;
st = be16_to_cpu(ddf->phys->entries[pd].state); st = be16_to_cpu(ddf->phys->entries[pd].state);
if ((st & (DDF_Online|DDF_Failed|DDF_Rebuilding)) if ((st & (DDF_Online|DDF_Failed|DDF_Rebuilding)) ==
== DDF_Online) { DDF_Online) {
working++; working++;
avail[i] = 1; avail[i] = 1;
} }

2
super-intel.c
View File

@ -4023,7 +4023,7 @@ static void migrate(struct imsm_dev *dev, struct intel_super *super,
/* duplicate and then set the target end state in map[0] */ /* duplicate and then set the target end state in map[0] */
memcpy(dest, src, sizeof_imsm_map(src)); memcpy(dest, src, sizeof_imsm_map(src));
if (migr_type == MIGR_REBUILD || migr_type == MIGR_GEN_MIGR) { if (migr_type == MIGR_REBUILD || migr_type == MIGR_GEN_MIGR) {
__u32 ord; __u32 ord;
int i; int i;