---

yaml --- r: 155909 b: refs/heads/master c: e457afe h: refs/heads/master i: 155907: cc07e95 v: v3
git-mirror · Jul 22, 2009 · 6e28c2a · 6e28c2a
1 parent 812006a
commit 6e28c2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 	}