From: Andrew Morton Update for linux-next changes. Cc: Ryusuke Konishi Signed-off-by: Andrew Morton --- fs/nilfs2/super.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff -puN fs/nilfs2/super.c~nilfs2-super-block-operations-fix fs/nilfs2/super.c --- a/fs/nilfs2/super.c~nilfs2-super-block-operations-fix +++ a/fs/nilfs2/super.c @@ -1125,7 +1125,7 @@ nilfs_get_sb(struct file_system_type *fs struct the_nilfs *nilfs = NULL; int err, need_to_close = 1; - sd.bdev = open_bdev_excl(dev_name, flags, fs_type); + sd.bdev = open_bdev_exclusive(dev_name, flags, fs_type); if (IS_ERR(sd.bdev)) return PTR_ERR(sd.bdev); @@ -1190,9 +1190,9 @@ nilfs_get_sb(struct file_system_type *fs nilfs_set_bdev_super, &sd); deactivate_super(s); /* - * Although deactivate_super() invokes close_bdev_excl() at + * Although deactivate_super() invokes close_bdev_exclusive() at * kill_block_super(). Here, s is an existent mount; we need - * one more close_bdev_excl() call. + * one more close_bdev_exclusive() call. */ s = s2; if (IS_ERR(s)) @@ -1219,20 +1219,20 @@ nilfs_get_sb(struct file_system_type *fs up(&sd.bdev->bd_mount_sem); put_nilfs(nilfs); if (need_to_close) - close_bdev_excl(sd.bdev); + close_bdev_exclusive(sd.bdev, flags); return simple_set_mnt(mnt, s); error_s: up(&sd.bdev->bd_mount_sem); if (nilfs) put_nilfs(nilfs); - close_bdev_excl(sd.bdev); + close_bdev_exclusive(sd.bdev, flags); return PTR_ERR(s); failed_unlock: up(&sd.bdev->bd_mount_sem); failed: - close_bdev_excl(sd.bdev); + close_bdev_exclusive(sd.bdev, flags); return err; @@ -1244,7 +1244,7 @@ nilfs_get_sb(struct file_system_type *fs up_write(&s->s_umount); deactivate_super(s); /* - * deactivate_super() invokes close_bdev_excl(). + * deactivate_super() invokes close_bdev_exclusive(). * We must finish all post-cleaning before this call; * put_nilfs() and unlocking bd_mount_sem need the block device. */ _