From 666f861e2eb2561278ad4b4a72c4a324db773a61 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Wed, 8 Dec 2010 12:22:34 -0500
Subject: [PATCH] --- yaml --- r: 223070 b: refs/heads/master c:
 7e1fea731da8c1b5fcf5d8e157befd389b030760 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 27765ccb2083..8298a416b51a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8399dee478db7939cd0d6fda8ecacddf2facd03
+refs/heads/master: 7e1fea731da8c1b5fcf5d8e157befd389b030760
diff --git a/trunk/fs/btrfs/orphan.c b/trunk/fs/btrfs/orphan.c
index 79cba5fbc28e..f8be250963a0 100644
--- a/trunk/fs/btrfs/orphan.c
+++ b/trunk/fs/btrfs/orphan.c
@@ -56,8 +56,12 @@ int btrfs_del_orphan_item(struct btrfs_trans_handle *trans,
 		return -ENOMEM;
 
 	ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
-	if (ret)
+	if (ret < 0)
 		goto out;
+	if (ret) {
+		ret = -ENOENT;
+		goto out;
+	}
 
 	ret = btrfs_del_item(trans, root, path);