diff options
| author | David Sterba <dsterba@suse.cz> | 2013-12-06 20:51:32 +0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2013-12-12 19:11:38 +0400 |
| commit | e43f998e47bae27e37e159915625e8d4b130153b (patch) | |
| tree | 03a1788ff0601554fca2c0fce2476548c80c78bd /fs/btrfs | |
| parent | a7e252af5a819eb71c9494e62b2bfca982e92f84 (diff) | |
| download | linux-e43f998e47bae27e37e159915625e8d4b130153b.tar.xz | |
btrfs: call mnt_drop_write after interrupted subvol deletion
If btrfs_ioctl_snap_destroy blocks on the mutex and the process is
killed, mnt_write count is unbalanced and leads to unmountable
filesystem.
CC: stable@vger.kernel.org
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index a111622598b0..21da5762b0b1 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2121,7 +2121,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, err = mutex_lock_killable_nested(&dir->i_mutex, I_MUTEX_PARENT); if (err == -EINTR) - goto out; + goto out_drop_write; dentry = lookup_one_len(vol_args->name, parent, namelen); if (IS_ERR(dentry)) { err = PTR_ERR(dentry); @@ -2284,6 +2284,7 @@ out_dput: dput(dentry); out_unlock_dir: mutex_unlock(&dir->i_mutex); +out_drop_write: mnt_drop_write_file(file); out: kfree(vol_args); |