OSDN Git Service

btrfs: don't double unlock on error in btrfs_punch_hole
authorJosef Bacik <josef@toxicpanda.com>
Fri, 3 May 2019 15:10:06 +0000 (11:10 -0400)
committerDavid Sterba <dsterba@suse.com>
Fri, 3 May 2019 16:21:36 +0000 (18:21 +0200)
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>
fs/btrfs/file.c

index 7e85dca..9dbea72 100644 (file)
@@ -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) {