From eda4bedc222a22192c7263e19f4848c55b824c01 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 17 Jul 2008 12:54:43 -0400
Subject: [PATCH] --- yaml --- r: 128827 b: refs/heads/master c:
 0bd40a718444b28793283b70286f9e29d464a189 h: refs/heads/master i:   128825:
 c4385ca015d906e3292ffc33d5985de48c1b8469   128823:
 94b44c298d7914a8852f27c78c387bdddcc57728 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/ctree.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8fb2f8a4ef2b..5941cb9ce127 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee6e6504e147a59a9f4d582662c105e9d72ae638
+refs/heads/master: 0bd40a718444b28793283b70286f9e29d464a189
diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c
index bbf9bf374066..cdc713062b03 100644
--- a/trunk/fs/btrfs/ctree.c
+++ b/trunk/fs/btrfs/ctree.c
@@ -3206,7 +3206,8 @@ int btrfs_next_leaf(struct btrfs_root *root, struct btrfs_path *path)
 			free_extent_buffer(next);
 		}
 
-		if (level == 1 && path->locks[1] && path->reada)
+		if (level == 1 && (path->locks[1] || path->skip_locking) &&
+		    path->reada)
 			reada_for_search(root, path, level, slot, 0);
 
 		next = read_node_slot(root, c, slot);