md: return directly before setting did_set_md_closing

[sfrench/cifs-2.6.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 08170902d3424436d722215b78036efb28e260ad..67e7660191bd50831a2563ee2430d19c0de6ad06 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7626,26 +7626,19 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
        switch (cmd) {
        case GET_ARRAY_INFO:
                if (!mddev->raid_disks && !mddev->external)
-                       err = -ENODEV;
-               else
-                       err = get_array_info(mddev, argp);
-               goto out;
+                       return -ENODEV;
+               return get_array_info(mddev, argp);
 
        case GET_DISK_INFO:
                if (!mddev->raid_disks && !mddev->external)
-                       err = -ENODEV;
-               else
-                       err = get_disk_info(mddev, argp);
-               goto out;
+                       return -ENODEV;
+               return get_disk_info(mddev, argp);
 
        case SET_DISK_FAULTY:
-               err = set_disk_faulty(mddev, new_decode_dev(arg));
-               goto out;
+               return set_disk_faulty(mddev, new_decode_dev(arg));
 
        case GET_BITMAP_FILE:
-               err = get_bitmap_file(mddev, argp);
-               goto out;
-
+               return get_bitmap_file(mddev, argp);
        }
 
        if (cmd == HOT_REMOVE_DISK)
@@ -7661,13 +7654,11 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
                mutex_lock(&mddev->open_mutex);
                if (mddev->pers && atomic_read(&mddev->openers) > 1) {
                        mutex_unlock(&mddev->open_mutex);
-                       err = -EBUSY;
-                       goto out;
+                       return -EBUSY;
                }
                if (test_and_set_bit(MD_CLOSING, &mddev->flags)) {
                        mutex_unlock(&mddev->open_mutex);
-                       err = -EBUSY;
-                       goto out;
+                       return -EBUSY;
                }
                did_set_md_closing = true;
                mutex_unlock(&mddev->open_mutex);