]> git.neil.brown.name Git - mdadm.git/commitdiff
ddf: fix bug with error returns.
authorNeilBrown <neilb@suse.de>
Thu, 2 Apr 2009 02:37:34 +0000 (13:37 +1100)
committerNeilBrown <neilb@suse.de>
Thu, 2 Apr 2009 02:37:34 +0000 (13:37 +1100)
In some cases we should only print an error message if
'devname' is defined.  In fact we were only returning
the error at all in that case!!

Signed-off-by: NeilBrown <neilb@suse.de>
super-ddf.c

index 6455deeee148cd1a9cbc01b2e3f37115f612dc39..11a3bac9092993230362dbb070b1b0099eb7e6dd 100644 (file)
@@ -781,22 +781,20 @@ static int load_super_ddf(struct supertype *st, int fd,
 
        /* 32M is a lower bound */
        if (dsize <= 32*1024*1024) {
-               if (devname) {
+               if (devname)
                        fprintf(stderr,
                                Name ": %s is too small for ddf: "
                                "size is %llu sectors.\n",
                                devname, dsize>>9);
-                       return 1;
-               }
+               return 1;
        }
        if (dsize & 511) {
-               if (devname) {
+               if (devname)
                        fprintf(stderr,
                                Name ": %s is an odd size for ddf: "
                                "size is %llu bytes.\n",
                                devname, dsize);
-                       return 1;
-               }
+               return 1;
        }
 
        if (posix_memalign((void**)&super, 512, sizeof(*super))!= 0) {