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

Change Detail and misc_scan to take a struct context 

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2012-07-09 17:20:16 +10:00
parent 4df01ff599
commit ef898ce65b
3 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Detail.c
View File

@ -27,7 +27,7 @@
#include "md_u.h" #include "md_u.h"
#include <dirent.h> #include <dirent.h>
int Detail(char *dev, int brief, int export, int test, char *homehost, char *prefer) int Detail(char *dev, struct context *c)
{ {
/* /*
* Print out details for an md array by using * Print out details for an md array by using
@ -56,7 +56,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost, char *pre
char *member = NULL; char *member = NULL;
char *container = NULL; char *container = NULL;
int rv = test ? 4 : 1; int rv = c->test ? 4 : 1;
int avail_disks = 0; int avail_disks = 0;
char *avail = NULL; char *avail = NULL;
@ -105,7 +105,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost, char *pre
int dn = st->container_dev; int dn = st->container_dev;
member = subarray; member = subarray;
container = map_dev_preferred(dev2major(dn), dev2minor(dn), 1, prefer); container = map_dev_preferred(dev2major(dn), dev2minor(dn), 1, c->prefer);
} }
/* try to load a superblock */ /* try to load a superblock */
@ -178,7 +178,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost, char *pre
/* Ok, we have some info to print... */ /* Ok, we have some info to print... */
str = map_num(pers, array.level); str = map_num(pers, array.level);
if (export) { if (c->export) {
if (array.raid_disks) { if (array.raid_disks) {
if (str) if (str)
printf("MD_LEVEL=%s\n", str); printf("MD_LEVEL=%s\n", str);
@ -262,10 +262,10 @@ int Detail(char *dev, int brief, int export, int test, char *homehost, char *pre
} }
} }
if (brief) { if (c->brief) {
mdu_bitmap_file_t bmf; mdu_bitmap_file_t bmf;
printf("ARRAY %s", dev); printf("ARRAY %s", dev);
if (brief > 1) { if (c->brief > 1) {
if (array.raid_disks) if (array.raid_disks)
printf(" level=%s num-devices=%d", printf(" level=%s num-devices=%d",
str?str:"-unknown-", str?str:"-unknown-",
@ -463,7 +463,7 @@ This is pretty boring
} else if (e && e->percent >= 0) } else if (e && e->percent >= 0)
printf("\n"); printf("\n");
if (st && st->sb) if (st && st->sb)
st->ss->detail_super(st, homehost); st->ss->detail_super(st, c->homehost);
if (array.raid_disks == 0 && sra && sra->array.major_version == -1 if (array.raid_disks == 0 && sra && sra->array.major_version == -1
&& sra->array.minor_version == -2 && sra->text_version[0] != '/') { && sra->array.minor_version == -2 && sra->text_version[0] != '/') {
@ -494,7 +494,7 @@ This is pretty boring
dn = devname2devnum(de->d_name); dn = devname2devnum(de->d_name);
printf(" %s", map_dev_preferred( printf(" %s", map_dev_preferred(
dev2major(dn), dev2major(dn),
dev2minor(dn), 1, prefer)); dev2minor(dn), 1, c->prefer));
} }
if (dir) if (dir)
closedir(dir); closedir(dir);
@ -516,7 +516,7 @@ This is pretty boring
disk.major == 0 && disk.major == 0 &&
disk.minor == 0) disk.minor == 0)
continue; continue;
if (!brief) { if (!c->brief) {
if (d == array.raid_disks) printf("\n"); if (d == array.raid_disks) printf("\n");
if (disk.raid_disk < 0) if (disk.raid_disk < 0)
printf(" %5d %5d %5d - ", printf(" %5d %5d %5d - ",
@ -525,7 +525,7 @@ This is pretty boring
printf(" %5d %5d %5d %5d ", printf(" %5d %5d %5d %5d ",
disk.number, disk.major, disk.minor, disk.raid_disk); disk.number, disk.major, disk.minor, disk.raid_disk);
} }
if (!brief && array.raid_disks) { if (!c->brief && array.raid_disks) {
if (disk.state & (1<<MD_DISK_FAULTY)) { if (disk.state & (1<<MD_DISK_FAULTY)) {
printf(" faulty"); printf(" faulty");
@ -569,11 +569,11 @@ This is pretty boring
} }
} }
if (disk.state == 0) spares++; if (disk.state == 0) spares++;
if (test && d < array.raid_disks if (c->test && d < array.raid_disks
&& !(disk.state & (1<<MD_DISK_SYNC))) && !(disk.state & (1<<MD_DISK_SYNC)))
rv |= 1; rv |= 1;
if ((dv=map_dev_preferred(disk.major, disk.minor, 0, prefer))) { if ((dv=map_dev_preferred(disk.major, disk.minor, 0, c->prefer))) {
if (brief) { if (c->brief) {
if (devices) { if (devices) {
devices = xrealloc(devices, devices = xrealloc(devices,
strlen(devices)+1+strlen(dv)+1); strlen(devices)+1+strlen(dv)+1);
@ -583,16 +583,17 @@ This is pretty boring
} else } else
printf(" %s", dv); printf(" %s", dv);
} }
if (!brief) printf("\n"); if (!c->brief) printf("\n");
} }
if (spares && brief && array.raid_disks) printf(" spares=%d", spares); if (spares && c->brief && array.raid_disks) printf(" spares=%d", spares);
if (brief && st && st->sb) if (c->brief && st && st->sb)
st->ss->brief_detail_super(st); st->ss->brief_detail_super(st);
st->ss->free_super(st); st->ss->free_super(st);
if (brief > 1 && devices) printf("\n devices=%s", devices); if (c->brief > 1 && devices) printf("\n devices=%s", devices);
if (brief) printf("\n"); if (c->brief)
if (test && printf("\n");
if (c->test &&
!enough(array.level, array.raid_disks, array.layout, !enough(array.level, array.raid_disks, array.layout,
1, avail)) 1, avail))
rv = 2; rv = 2;

20
mdadm.c
View File

@ -33,8 +33,7 @@
static int scan_assemble(struct supertype *ss, static int scan_assemble(struct supertype *ss,
struct context *c, struct context *c,
struct mddev_ident *ident); struct mddev_ident *ident);
static int misc_scan(char devmode, int verbose, int export, int test, static int misc_scan(char devmode, struct context *c);
char *homehost, char *prefer);
static int stop_scan(int verbose); static int stop_scan(int verbose);
static int misc_list(struct mddev_dev *devlist, static int misc_list(struct mddev_dev *devlist,
struct mddev_ident *ident, struct mddev_ident *ident,
@ -1361,8 +1360,7 @@ int main(int argc, char *argv[])
if (devmode == 'S' && c.scan) if (devmode == 'S' && c.scan)
rv = stop_scan(c.verbose); rv = stop_scan(c.verbose);
else if ((devmode == 'D' || devmode == Waitclean) && c.scan) else if ((devmode == 'D' || devmode == Waitclean) && c.scan)
rv = misc_scan(devmode, c.verbose, c.export, rv = misc_scan(devmode, &c);
c.test, c.homehost, c.prefer);
else if (devmode == UdevRules) else if (devmode == UdevRules)
rv = Write_rules(udev_filename); rv = Write_rules(udev_filename);
else { else {
@ -1598,8 +1596,7 @@ static int scan_assemble(struct supertype *ss,
return rv; return rv;
} }
static int misc_scan(char devmode, int verbose, int export, int test, static int misc_scan(char devmode, struct context *c)
char *homehost, char *prefer)
{ {
/* apply --detail or --wait-clean to /* apply --detail or --wait-clean to
* all devices in /proc/mdstat * all devices in /proc/mdstat
@ -1608,7 +1605,6 @@ static int misc_scan(char devmode, int verbose, int export, int test,
struct mdstat_ent *e; struct mdstat_ent *e;
struct map_ent *map = NULL; struct map_ent *map = NULL;
int members; int members;
int v = verbose>1?0:verbose+1;
int rv = 0; int rv = 0;
for (members = 0; members <= 1; members++) { for (members = 0; members <= 1; members++) {
@ -1633,11 +1629,9 @@ static int misc_scan(char devmode, int verbose, int export, int test,
continue; continue;
} }
if (devmode == 'D') if (devmode == 'D')
rv |= Detail(name, v, rv |= Detail(name, c);
export, test,
homehost, prefer);
else else
rv |= WaitClean(name, -1, v); rv |= WaitClean(name, -1, c->verbose);
put_md_name(name); put_md_name(name);
} }
} }
@ -1699,9 +1693,7 @@ static int misc_list(struct mddev_dev *devlist,
switch(dv->disposition) { switch(dv->disposition) {
case 'D': case 'D':
rv |= Detail(dv->devname, rv |= Detail(dv->devname, c);
c->brief?1+c->verbose:0,
c->export, c->test, c->homehost, c->prefer);
continue; continue;
case KillOpt: /* Zero superblock */ case KillOpt: /* Zero superblock */
if (ss) if (ss)

2
mdadm.h
View File

@ -1113,7 +1113,7 @@ extern int Create(struct supertype *st, char *mddev,
char *bitmap_file, int bitmap_chunk, int write_behind, char *bitmap_file, int bitmap_chunk, int write_behind,
struct context *c); struct context *c);
extern int Detail(char *dev, int brief, int export, int test, char *homehost, char *prefer); extern int Detail(char *dev, struct context *c);
extern int Detail_Platform(struct superswitch *ss, int scan, int verbose); extern int Detail_Platform(struct superswitch *ss, int scan, int verbose);
extern int Query(char *dev); extern int Query(char *dev);
extern int Examine(struct mddev_dev *devlist, struct context *c, extern int Examine(struct mddev_dev *devlist, struct context *c,