summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJosef Bacik <josef@toxicpanda.com>2019-05-03 11:10:06 -0400
committerDavid Sterba <dsterba@suse.com>2019-05-03 18:21:36 +0200
commit8fca955057b9c58467d1b231e43f19c4cf26ae8c (patch)
treebe1c2fcdc0d9968f7db0632976634e213604f710 /fs
parent2b90883c561ddcc641741c2e4df1f702a4f2acb8 (diff)
downloadlinux-stable-8fca955057b9c58467d1b231e43f19c4cf26ae8c.tar.gz
linux-stable-8fca955057b9c58467d1b231e43f19c4cf26ae8c.tar.bz2
linux-stable-8fca955057b9c58467d1b231e43f19c4cf26ae8c.zip
btrfs: don't double unlock on error in btrfs_punch_hole
If we have an error writing out a delalloc range in btrfs_punch_hole_lock_range we'll unlock the inode and then goto out_only_mutex, where we will again unlock the inode. This is bad, don't do this. Fixes: f27451f22996 ("Btrfs: add support for fallocate's zero range operation") CC: stable@vger.kernel.org # 4.19+ Reviewed-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/file.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 7e85dca0e6f2..9dbea72a61fe 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2554,10 +2554,8 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
ret = btrfs_punch_hole_lock_range(inode, lockstart, lockend,
&cached_state);
- if (ret) {
- inode_unlock(inode);
+ if (ret)
goto out_only_mutex;
- }
path = btrfs_alloc_path();
if (!path) {