---

yaml --- r: 263732 b: refs/heads/master c: ddf23b3 h: refs/heads/master v: v3
git-mirror · Sep 11, 2011 · b316667 · b316667
1 parent 7b27dea
commit b316667
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0b6d65be57fb37ca67b04ce8964546a74d2125c
+refs/heads/master: ddf23b3fc6850bd4654d51ec9457fe7c77cde51e
diff --git a/trunk/fs/btrfs/file-item.c b/trunk/fs/btrfs/file-item.c
@@ -183,8 +183,10 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
 	 * read from the commit root and sidestep a nasty deadlock
 	 * between reading the free space cache and updating the csum tree.
 	 */
-	if (btrfs_is_free_space_inode(root, inode))
+	if (btrfs_is_free_space_inode(root, inode)) {
 		path->search_commit_root = 1;
+		path->skip_locking = 1;
+	}
 
 	disk_bytenr = (u64)bio->bi_sector << 9;
 	if (dio)