From e59597fce89bb29979542d0f14cb3bdeafec32d2 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Fri, 28 Jan 2011 18:44:44 +0000
Subject: [PATCH] --- yaml --- r: 233001 b: refs/heads/master c:
 ad0397a7a97f55fd7f70998ec208c5d8b90310ff h: refs/heads/master i:   232999:
 4afaf349cee5ae866ff718546fced17167a55c89 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/btrfs/file-item.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 677ef112636d..848aa74623d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68a82277b8619e6d0f2738b1d9b160b627e81e92
+refs/heads/master: ad0397a7a97f55fd7f70998ec208c5d8b90310ff
diff --git a/trunk/fs/btrfs/file-item.c b/trunk/fs/btrfs/file-item.c
index d0bc72657cd7..4f19a3e1bf32 100644
--- a/trunk/fs/btrfs/file-item.c
+++ b/trunk/fs/btrfs/file-item.c
@@ -550,7 +550,10 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
 			if (path->slots[0] == 0)
 				goto out;
 			path->slots[0]--;
+		} else if (ret < 0) {
+			goto out;
 		}
+
 		leaf = path->nodes[0];
 		btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);