From 7779fc6d175648c6ab093dae4d4183970ec221af Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 4 Nov 2008 10:35:10 +1100 Subject: [PATCH 11/19] Rename open_mddev to create_mddev This reflect that fact that more often than not it is creating things in /dev, and allows for a new open_mddev which does just that. NeilBrown: 2399204dddcabcf629ccb57be1957010444fc0ea Signed-off-by: NeilBrown Signed-off-by: Surbhi Palande --- Assemble.c | 4 ++-- Incremental.c | 4 ++-- mdadm.c | 12 ++++++------ mdadm.h | 4 ++-- mdassemble.c | 4 ++-- mdopen.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Assemble.c b/Assemble.c index 4acb23d..51eb912 100644 --- a/Assemble.c +++ b/Assemble.c @@ -375,7 +375,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd, if (mdfd < 0) { /* So... it is up to me to open the device. * We create a name '/dev/md/XXX' based on the info in the - * superblock, and call open_mddev on that + * superblock, and call create_mddev on that */ mdu_array_info_t inf; char *c; @@ -394,7 +394,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd, int ret = asprintf(&mddev, "/dev/md/%s", c); assert(ret >= 0); } - mdfd = open_mddev(mddev, ident->autof); + mdfd = create_mddev(mddev, ident->autof); if (mdfd < 0) { st->ss->free_super(st); free(devices); diff --git a/Incremental.c b/Incremental.c index deeb5bb..870914d 100644 --- a/Incremental.c +++ b/Incremental.c @@ -257,7 +257,7 @@ int Incremental(char *devname, int verbose, int runstop, } else devnum = use_partitions ? (-1-devnum) : devnum; } - mdfd = open_mddev_devnum(match ? match->devname : NULL, + mdfd = create_mddev_devnum(match ? match->devname : NULL, devnum, info.name, chosen_name, autof >> 3); @@ -683,7 +683,7 @@ int IncrementalScan(int verbose) mdu_array_info_t array; mdu_bitmap_file_t bmf; struct mdinfo *sra; - int mdfd = open_mddev_devnum(me->path, me->devnum, + int mdfd = create_mddev_devnum(me->path, me->devnum, NULL, path, 0); if (mdfd < 0) continue; diff --git a/mdadm.c b/mdadm.c index 641d717..55971fa 100644 --- a/mdadm.c +++ b/mdadm.c @@ -948,7 +948,7 @@ int main(int argc, char *argv[]) } if (mode == MANAGE || mode == GROW) autof=1; /* Don't create */ - mdfd = open_mddev(devlist->devname, autof); + mdfd = create_mddev(devlist->devname, autof); if (mdfd < 0) exit(1); if ((int)ident.super_minor == -2) { @@ -1012,7 +1012,7 @@ int main(int argc, char *argv[]) devlist->devname); rv |= 1; } else { - mdfd = open_mddev(devlist->devname, + mdfd = create_mddev(devlist->devname, array_ident->autof ? array_ident->autof : autof); if (mdfd < 0) rv |= 1; @@ -1044,7 +1044,7 @@ int main(int argc, char *argv[]) rv |= 1; continue; } - mdfd = open_mddev(dv->devname, + mdfd = create_mddev(dv->devname, array_ident->autof ?array_ident->autof : autof); if (mdfd < 0) { rv |= 1; @@ -1073,7 +1073,7 @@ int main(int argc, char *argv[]) } for (; array_list; array_list = array_list->next) { mdu_array_info_t array; - mdfd = open_mddev(array_list->devname, + mdfd = create_mddev(array_list->devname, array_list->autof ? array_list->autof : autof); if (mdfd < 0) { rv |= 1; @@ -1246,7 +1246,7 @@ int main(int argc, char *argv[]) e->dev); continue; } - mdfd = open_mddev(name, 1); + mdfd = create_mddev(name, 1); if (mdfd >= 0) { if (Manage_runstop(name, mdfd, -1, quiet?1:last?0:-1)) err = 1; @@ -1280,7 +1280,7 @@ int main(int argc, char *argv[]) case 'W': rv |= Wait(dv->devname); continue; } - mdfd = open_mddev(dv->devname, 1); + mdfd = create_mddev(dv->devname, 1); if (mdfd>=0) { switch(dv->disposition) { case 'R': diff --git a/mdadm.h b/mdadm.h index 9649574..ee713fd 100644 --- a/mdadm.h +++ b/mdadm.h @@ -524,8 +524,8 @@ extern char *get_md_name(int dev); extern char DefaultConfFile[]; -extern int open_mddev(char *dev, int autof); -extern int open_mddev_devnum(char *devname, int devnum, char *name, +extern int create_mddev(char *dev, int autof); +extern int create_mddev_devnum(char *devname, int devnum, char *name, char *chosen_name, int parts); diff --git a/mdassemble.c b/mdassemble.c index 9926dde..47119bf 100644 --- a/mdassemble.c +++ b/mdassemble.c @@ -55,7 +55,7 @@ mapping_t pers[] = { #ifndef MDASSEMBLE_AUTO /* from mdopen.c */ -int open_mddev(char *dev, int autof/*unused */) +int create_mddev(char *dev, int autof/*unused */) { int mdfd = open(dev, O_RDWR, 0); if (mdfd < 0) @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) { } else for (; array_list; array_list = array_list->next) { mdu_array_info_t array; - mdfd = open_mddev(array_list->devname, array_list->autof); + mdfd = create_mddev(array_list->devname, array_list->autof); if (mdfd < 0) { rv |= 1; continue; diff --git a/mdopen.c b/mdopen.c index 448a9eb..f4995ad 100644 --- a/mdopen.c +++ b/mdopen.c @@ -106,7 +106,7 @@ void make_parts(char *dev, int cnt, int symlinks) * If it now doesn't exist, we find a new md array and create the device. * Default ownership/mode comes from config file. */ -int open_mddev(char *dev, int autof) +int create_mddev(char *dev, int autof) { int mdfd; struct stat stb; @@ -268,7 +268,7 @@ int open_mddev(char *dev, int autof) } -int open_mddev_devnum(char *devname, int devnum, char *name, +int create_mddev_devnum(char *devname, int devnum, char *name, char *chosen_name, int parts) { /* Open the md device with number 'devnum', possibly using 'devname', -- 1.7.0.4