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

Assemble: revert preliminary -As support 

I have seen the light.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2008-11-04 20:51:11 +11:00 committed by NeilBrown
parent 98dbd96605
commit ce744c97bc
4 changed files with 9 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Assemble.c
View File

@ -167,52 +167,6 @@ int Assemble(struct supertype *st, char *mddev,
return 1;
}
/* if the configuration specifies a container then we use that to
* determine the devices and retrieve the array configuration
*/
#ifndef MDASSEMBLE
if (ident->container && ident->member) {
int cfd = open(ident->container, O_RDWR);
struct mdinfo *mdi;
struct supertype container;
if (verbose>0)
fprintf(stderr, Name ": looking to assemble member array %s"
" inside container %s\n", ident->member, ident->container);
if (cfd < 0) {
if (verbose>0)
fprintf(stderr, Name ": unable to open container %s: %s\n",
ident->container, strerror(errno));
return 1;
}
mdi = sysfs_read(cfd, fd2devnum(cfd), GET_VERSION);
if (!mdi) {
close(cfd);
if (verbose>0)
fprintf(stderr, Name ": unable to read container %s\n",
ident->container);
return 1;
}
container.ss = find_metadata_methods(mdi->text_version);
sysfs_free(mdi);
if (!container.ss) {
close(cfd);
fprintf(stderr, Name ": %s uses unknown metadata: %s\n",
ident->container, mdi->text_version);
return 1;
}
if (container.ss->load_super(&container, cfd, ident->container)) {
fprintf(stderr, Name ": Cannot load metadata for container %s\n",
ident->container);
return 1;
}
return Incremental_container(&container, ident->container,
verbose, runstop, ident->autof,
LOCAL);
}
#endif
if (devlist == NULL)
devlist = conf_get_devs();
else if (mddev)

1
mdadm.h
View File

@ -789,7 +789,6 @@ extern unsigned long long calc_array_size(int level, int raid_disks, int layout,
int chunksize, unsigned long long devsize);
extern int flush_metadata_updates(struct supertype *st);
extern void append_metadata_update(struct supertype *st, void *buf, int len);
extern struct superswitch *find_metadata_methods(char *vers);
extern int add_disk(int mdfd, struct supertype *st,
struct mdinfo *sra, struct mdinfo *info);

9
mdmon.c
View File

@ -92,6 +92,15 @@ int clone_monitor(struct supertype *container)
return mon_tid;
}
static struct superswitch *find_metadata_methods(char *vers)
{
if (strcmp(vers, "ddf") == 0)
return &super_ddf;
if (strcmp(vers, "imsm") == 0)
return &super_imsm;
return NULL;
}
int make_pidfile(char *devname, int o_excl)
{

9
util.c
View File

@ -1299,15 +1299,6 @@ void append_metadata_update(struct supertype *st, void *buf, int len)
*st->update_tail = mu;
st->update_tail = &mu->next;
}
struct superswitch *find_metadata_methods(char *vers)
{
if (strcmp(vers, "ddf") == 0)
return &super_ddf;
if (strcmp(vers, "imsm") == 0)
return &super_imsm;
return NULL;
}
#endif /* MDASSEMBLE */
#ifdef __TINYC__