diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-05-06 01:34:22 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-05-09 10:49:40 -0400 |
| commit | 6f5bbff9a1b7d6864a495763448a363bbfa96324 (patch) | |
| tree | 0067dca46f40def1c55541c34c262e06aeb8c4c8 /fs/btrfs | |
| parent | 74dbbdd7fdc11763f4698d2f3e684cf4446951e6 (diff) | |
| download | kernel-crypto-6f5bbff9a1b7d6864a495763448a363bbfa96324.tar.gz kernel-crypto-6f5bbff9a1b7d6864a495763448a363bbfa96324.tar.xz kernel-crypto-6f5bbff9a1b7d6864a495763448a363bbfa96324.zip | |
Convert obvious places to deactivate_locked_super()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/super.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 3536bdb2d7c..6dfae5b28f5 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -502,8 +502,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, if (s->s_root) { if ((flags ^ s->s_flags) & MS_RDONLY) { - up_write(&s->s_umount); - deactivate_super(s); + deactivate_locked_super(s); error = -EBUSY; goto error_close_devices; } @@ -517,8 +516,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, error = btrfs_fill_super(s, fs_devices, data, flags & MS_SILENT ? 1 : 0); if (error) { - up_write(&s->s_umount); - deactivate_super(s); + deactivate_locked_super(s); goto error_free_subvol_name; } @@ -535,15 +533,13 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, mutex_unlock(&s->s_root->d_inode->i_mutex); if (IS_ERR(root)) { - up_write(&s->s_umount); - deactivate_super(s); + deactivate_locked_super(s); error = PTR_ERR(root); goto error_free_subvol_name; } if (!root->d_inode) { dput(root); - up_write(&s->s_umount); - deactivate_super(s); + deactivate_locked_super(s); error = -ENXIO; goto error_free_subvol_name; } |