@@ -7626,26 +7626,19 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
7626
7626
switch (cmd ) {
7627
7627
case GET_ARRAY_INFO :
7628
7628
if (!mddev -> raid_disks && !mddev -> external )
7629
- err = - ENODEV ;
7630
- else
7631
- err = get_array_info (mddev , argp );
7632
- goto out ;
7629
+ return - ENODEV ;
7630
+ return get_array_info (mddev , argp );
7633
7631
7634
7632
case GET_DISK_INFO :
7635
7633
if (!mddev -> raid_disks && !mddev -> external )
7636
- err = - ENODEV ;
7637
- else
7638
- err = get_disk_info (mddev , argp );
7639
- goto out ;
7634
+ return - ENODEV ;
7635
+ return get_disk_info (mddev , argp );
7640
7636
7641
7637
case SET_DISK_FAULTY :
7642
- err = set_disk_faulty (mddev , new_decode_dev (arg ));
7643
- goto out ;
7638
+ return set_disk_faulty (mddev , new_decode_dev (arg ));
7644
7639
7645
7640
case GET_BITMAP_FILE :
7646
- err = get_bitmap_file (mddev , argp );
7647
- goto out ;
7648
-
7641
+ return get_bitmap_file (mddev , argp );
7649
7642
}
7650
7643
7651
7644
if (cmd == HOT_REMOVE_DISK )
@@ -7661,13 +7654,11 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
7661
7654
mutex_lock (& mddev -> open_mutex );
7662
7655
if (mddev -> pers && atomic_read (& mddev -> openers ) > 1 ) {
7663
7656
mutex_unlock (& mddev -> open_mutex );
7664
- err = - EBUSY ;
7665
- goto out ;
7657
+ return - EBUSY ;
7666
7658
}
7667
7659
if (test_and_set_bit (MD_CLOSING , & mddev -> flags )) {
7668
7660
mutex_unlock (& mddev -> open_mutex );
7669
- err = - EBUSY ;
7670
- goto out ;
7661
+ return - EBUSY ;
7671
7662
}
7672
7663
did_set_md_closing = true;
7673
7664
mutex_unlock (& mddev -> open_mutex );
0 commit comments