mdstat: discard 'dev' field, just use 'devnm'

[thirdparty/mdadm.git] / Manage.c

diff --git a/Manage.c b/Manage.c
index 225af81384cba26d82ba3bad3da6639ecbe8e07f..4958cf8b838238953b5e5749382014f1cd406943 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -316,7 +316,7 @@ int Manage_stop(char *devname, int fd, int verbose, int will_retry)
                                                       devnm)) {
                                if (verbose >= 0)
                                        pr_err("Cannot stop container %s: member %s still active\n",
-                                              devname, m->dev);
+                                              devname, m->devnm);
                                free_mdstat(mds);
                                rv = 1;
                                goto out;
@@ -781,7 +781,8 @@ int Manage_add(int fd, int tfd, struct mddev_dev *dv,
                }
 
                /* Make sure device is large enough */
-               if (tst->ss->avail_size(tst, ldsize/512, INVALID_SECTORS) <
+               if (tst->sb &&
+                   tst->ss->avail_size(tst, ldsize/512, INVALID_SECTORS) <
                    array_size) {
                        if (dv->disposition == 'M')
                                return 0;