From 6e28c2a831a23112e52a887490b6918ce8e93001 Mon Sep 17 00:00:00 2001
From: Yan Zheng <zheng.yan@oracle.com>
Date: Wed, 22 Jul 2009 09:59:00 -0400
Subject: [PATCH] --- yaml --- r: 155909 b: refs/heads/master c:
 e457afec60fdbd86b963d36f4a8a9285088c6043 h: refs/heads/master i:   155907:
 cc07e9552d3f4404e6a5a5c276623eb8826b1020 v: v3

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

diff --git a/[refs] b/[refs]
index fd852a569198..05529a251021 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf1fb512a58d7aeb41aaa40d6d2d2d29e08e506a
+refs/heads/master: e457afec60fdbd86b963d36f4a8a9285088c6043
diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c
index 60a45f3a4e91..7bb66c65ddfd 100644
--- a/trunk/fs/btrfs/ctree.c
+++ b/trunk/fs/btrfs/ctree.c
@@ -4146,7 +4146,8 @@ int btrfs_next_leaf(struct btrfs_root *root, struct btrfs_path *path)
 	 * advance the path if there are now more items available.
 	 */
 	if (nritems > 0 && path->slots[0] < nritems - 1) {
-		path->slots[0]++;
+		if (ret == 0)
+			path->slots[0]++;
 		ret = 0;
 		goto done;
 	}