Skip to content

Commit e0391e9

Browse files
fdmananakdave
authored andcommitted
btrfs: fix double inode unlock for direct IO sync writes
If we do a direct IO sync write, at btrfs_sync_file(), and we need to skip inode logging or we get an error starting a transaction or an error when flushing delalloc, we end up unlocking the inode when we shouldn't under the 'out_release_extents' label, and then unlock it again at btrfs_direct_write(). Fix that by checking if we have to skip inode unlocking under that label. Reported-by: syzbot+7dbbb74af6291b5a5a8b@syzkaller.appspotmail.com Link: https://lore.kernel.org/linux-btrfs/000000000000dfd631061eaeb4bc@google.com/ Fixes: 939b656 ("btrfs: fix corruption after buffer fault in during direct IO append write") Reviewed-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 1e7bec1 commit e0391e9

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

fs/btrfs/file.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1868,7 +1868,10 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
18681868

18691869
out_release_extents:
18701870
btrfs_release_log_ctx_extents(&ctx);
1871-
btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);
1871+
if (skip_ilock)
1872+
up_write(&inode->i_mmap_lock);
1873+
else
1874+
btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);
18721875
goto out;
18731876
}
18741877

0 commit comments

Comments
 (0)