Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

bdeeab62 · Linus Torvalds <[email protected]> · 2013-10-18 16:46:21 -07:00

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

Commit: bdeeab62a611f1f7cd48fd285ce568e8dcd0455a
Parents: 797afdf7 · 1bda19eb

Merge commit. Changes below are compared with the first parent: 797afdf7.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
fs/btrfs/inode.c	modified	+1	−0	View file

fs/btrfs/inode.c

View file

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b0ef7b0..51e3afa 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