diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-07-01 17:36:11 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-07-01 17:36:11 -0700 |
| commit | d19e3cfb6627c40e3a28454ebc2098c0e19b9a77 (patch) | |
| tree | 362fe9dceb5037be4f48ffc2cf9ddfd9e2635c34 /super-ddf.c | |
| parent | 8cfc801c72f079618b39d04c2e0fe32adbc2474e (diff) | |
| parent | 23eb475a96b1b0cf7f8feaeb7b32355b80e8faa7 (diff) | |
| download | mdadm-d19e3cfb6627c40e3a28454ebc2098c0e19b9a77.tar.gz mdadm-d19e3cfb6627c40e3a28454ebc2098c0e19b9a77.tar.xz mdadm-d19e3cfb6627c40e3a28454ebc2098c0e19b9a77.zip | |
Merge branch 'fixes' into for-neil
Diffstat (limited to 'super-ddf.c')
| -rw-r--r-- | super-ddf.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/super-ddf.c b/super-ddf.c index 736e07f..6dd3173 100644 --- a/super-ddf.c +++ b/super-ddf.c @@ -1365,6 +1365,7 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info) (ddf->anchor.guid+16)); info->array.utime = 0; info->array.chunk_size = 0; + info->container_enough = 0; info->disk.major = 0; @@ -2814,14 +2815,8 @@ static int load_super_ddf_all(struct supertype *st, int fd, int seq; char nm[20]; int dfd; - int devnum = fd2devnum(fd); - enum sysfs_read_flags flags; - flags = GET_LEVEL|GET_VERSION|GET_DEVS|GET_STATE; - if (mdmon_running(devnum)) - flags |= SKIP_GONE_DEVS; - - sra = sysfs_read(fd, 0, flags); + sra = sysfs_read(fd, 0, GET_LEVEL|GET_VERSION|GET_DEVS|GET_STATE); if (!sra) return 1; if (sra->array.major_version != -1 || |