diff options
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/super.c b/fs/super.c index ca696155cd9a..22374bf0ba87 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -801,13 +801,13 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, | |||
801 | 801 | ||
802 | /* | 802 | /* |
803 | * s_umount nests inside bd_mutex during | 803 | * s_umount nests inside bd_mutex during |
804 | * __invalidate_device(). close_bdev_exclusive() | 804 | * __invalidate_device(). blkdev_put() acquires |
805 | * acquires bd_mutex and can't be called under | 805 | * bd_mutex and can't be called under s_umount. Drop |
806 | * s_umount. Drop s_umount temporarily. This is safe | 806 | * s_umount temporarily. This is safe as we're |
807 | * as we're holding an active reference. | 807 | * holding an active reference. |
808 | */ | 808 | */ |
809 | up_write(&s->s_umount); | 809 | up_write(&s->s_umount); |
810 | close_bdev_exclusive(bdev, mode); | 810 | blkdev_put(bdev, mode | FMODE_EXCL); |
811 | down_write(&s->s_umount); | 811 | down_write(&s->s_umount); |
812 | } else { | 812 | } else { |
813 | char b[BDEVNAME_SIZE]; | 813 | char b[BDEVNAME_SIZE]; |
@@ -831,7 +831,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, | |||
831 | error_s: | 831 | error_s: |
832 | error = PTR_ERR(s); | 832 | error = PTR_ERR(s); |
833 | error_bdev: | 833 | error_bdev: |
834 | close_bdev_exclusive(bdev, mode); | 834 | blkdev_put(bdev, mode | FMODE_EXCL); |
835 | error: | 835 | error: |
836 | return ERR_PTR(error); | 836 | return ERR_PTR(error); |
837 | } | 837 | } |
@@ -862,7 +862,7 @@ void kill_block_super(struct super_block *sb) | |||
862 | bdev->bd_super = NULL; | 862 | bdev->bd_super = NULL; |
863 | generic_shutdown_super(sb); | 863 | generic_shutdown_super(sb); |
864 | sync_blockdev(bdev); | 864 | sync_blockdev(bdev); |
865 | close_bdev_exclusive(bdev, mode); | 865 | blkdev_put(bdev, mode | FMODE_EXCL); |
866 | } | 866 | } |
867 | 867 | ||
868 | EXPORT_SYMBOL(kill_block_super); | 868 | EXPORT_SYMBOL(kill_block_super); |