---

yaml --- r: 233001 b: refs/heads/master c: ad0397a h: refs/heads/master i: 232999: 4afaf34 v: v3
git-mirror · Jan 28, 2011 · e59597f · e59597f
1 parent 5ef89fb
commit e59597f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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]);