diff options
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/dm.c | 4 | ||||
-rw-r--r-- | drivers/md/md.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 9a0bdad9ad8f..d5370a94b2c1 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
@@ -339,7 +339,7 @@ out: | |||
339 | return md ? 0 : -ENXIO; | 339 | return md ? 0 : -ENXIO; |
340 | } | 340 | } |
341 | 341 | ||
342 | static int dm_blk_close(struct gendisk *disk, fmode_t mode) | 342 | static void dm_blk_close(struct gendisk *disk, fmode_t mode) |
343 | { | 343 | { |
344 | struct mapped_device *md = disk->private_data; | 344 | struct mapped_device *md = disk->private_data; |
345 | 345 | ||
@@ -349,8 +349,6 @@ static int dm_blk_close(struct gendisk *disk, fmode_t mode) | |||
349 | dm_put(md); | 349 | dm_put(md); |
350 | 350 | ||
351 | spin_unlock(&_minor_lock); | 351 | spin_unlock(&_minor_lock); |
352 | |||
353 | return 0; | ||
354 | } | 352 | } |
355 | 353 | ||
356 | int dm_open_count(struct mapped_device *md) | 354 | int dm_open_count(struct mapped_device *md) |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 4c74424c78b0..6330c727396c 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -6674,15 +6674,13 @@ static int md_open(struct block_device *bdev, fmode_t mode) | |||
6674 | return err; | 6674 | return err; |
6675 | } | 6675 | } |
6676 | 6676 | ||
6677 | static int md_release(struct gendisk *disk, fmode_t mode) | 6677 | static void md_release(struct gendisk *disk, fmode_t mode) |
6678 | { | 6678 | { |
6679 | struct mddev *mddev = disk->private_data; | 6679 | struct mddev *mddev = disk->private_data; |
6680 | 6680 | ||
6681 | BUG_ON(!mddev); | 6681 | BUG_ON(!mddev); |
6682 | atomic_dec(&mddev->openers); | 6682 | atomic_dec(&mddev->openers); |
6683 | mddev_put(mddev); | 6683 | mddev_put(mddev); |
6684 | |||
6685 | return 0; | ||
6686 | } | 6684 | } |
6687 | 6685 | ||
6688 | static int md_media_changed(struct gendisk *disk) | 6686 | static int md_media_changed(struct gendisk *disk) |