From 2399204dddcabcf629ccb57be1957010444fc0ea Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 4 Nov 2008 10:35:10 +1100 Subject: [PATCH] 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. Signed-off-by: NeilBrown --- Assemble.c | 4 ++-- Incremental.c | 6 +++--- mdadm.c | 12 ++++++------ mdadm.h | 4 ++-- mdassemble.c | 4 ++-- mdopen.c | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Assemble.c b/Assemble.c index 526b1d5a..fa534fd2 100644 --- a/Assemble.c +++ b/Assemble.c @@ -437,7 +437,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; @@ -462,7 +462,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd, if (rc < 0) mdfd = -1; else - 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 8619c28e..08960a5f 100644 --- a/Incremental.c +++ b/Incremental.c @@ -311,7 +311,7 @@ int Incremental(char *devname, int verbose, int runstop, devnum = use_partitions ? (-1-devnum) : devnum; } - mdfd = open_mddev_devnum(match ? match->devname : mp ? mp->path : NULL, + mdfd = create_mddev_devnum(match ? match->devname : mp ? mp->path : NULL, devnum, name_to_use, chosen_name, autof >> 3); @@ -714,7 +714,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; @@ -898,7 +898,7 @@ int Incremental_container(struct supertype *st, char *devname, int verbose, else devnum = find_free_devnum(usepart); } - mdfd = open_mddev_devnum(mp ? mp->path : match ? match->devname : NULL, + mdfd = create_mddev_devnum(mp ? mp->path : match ? match->devname : NULL, devnum, name_to_use, chosen_name, autof>>3); diff --git a/mdadm.c b/mdadm.c index 97592204..fb52b141 100644 --- a/mdadm.c +++ b/mdadm.c @@ -944,7 +944,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) { @@ -1008,7 +1008,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; @@ -1040,7 +1040,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; @@ -1069,7 +1069,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; @@ -1242,7 +1242,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; @@ -1279,7 +1279,7 @@ int main(int argc, char *argv[]) case Waitclean: rv |= WaitClean(dv->devname, verbose-quiet); 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 4b006fb6..8527bbb1 100644 --- a/mdadm.h +++ b/mdadm.h @@ -801,8 +801,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); extern int open_container(int fd); diff --git a/mdassemble.c b/mdassemble.c index b0d87b83..66d82131 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); 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 eee1eea1..51568359 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', -- 2.39.2