path: root/fs
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-18 16:46:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-18 16:46:21 -0700
commitbdeeab62a611f1f7cd48fd285ce568e8dcd0455a (patch)
tree93e5e16b5ef769093dca6cb23e44b83433f4b688 /fs
parent797afdf70844c719d229174c460687fb17af9762 (diff)
parent1bda19eb73d68b304148e67253e47cef049a419d (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason: "Sage hit a deadlock with ceph on btrfs, and Josef tracked it down to a regression in our initial rc1 pull. When doing nocow writes we were sometimes starting a transaction with locks held" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: release path before starting transaction in can_nocow_extent
Diffstat (limited to 'fs')
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b0ef7b07b1b..51e3afa7835 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6437,6 +6437,7 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,
if (btrfs_extent_readonly(root, disk_bytenr))
goto out;
+ btrfs_release_path(path);
* look for other files referencing this extent, if we