diff options
| author | David Sterba <dsterba@suse.cz> | 2013-12-06 17:51:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 07:45:10 -0800 |
| commit | 89ec75229a591cd7a3f57c330dc0791b8646b112 (patch) | |
| tree | 0074b91e06f2f95ca4f1763e86a3ce8ceafd37a7 /fs/btrfs | |
| parent | 6b047827d4cdd57ac7c4f9da2d779d811649566f (diff) | |
| download | linux-3.10-89ec75229a591cd7a3f57c330dc0791b8646b112.tar.gz linux-3.10-89ec75229a591cd7a3f57c330dc0791b8646b112.tar.bz2 linux-3.10-89ec75229a591cd7a3f57c330dc0791b8646b112.zip | |
btrfs: call mnt_drop_write after interrupted subvol deletion
commit e43f998e47bae27e37e159915625e8d4b130153b upstream.
If btrfs_ioctl_snap_destroy blocks on the mutex and the process is
killed, mnt_write count is unbalanced and leads to unmountable
filesystem.
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 8dedf401967..145b2c75ab8 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2093,7 +2093,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); @@ -2235,6 +2235,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); |