From ae2ec2efbd9a07b43ed95faad7137276b46434f1 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 3 Jan 2008 13:23:19 -0500
Subject: [PATCH] --- yaml --- r: 128589 b: refs/heads/master c:
 bd09835d9aad9c7b664cddc8435cc37b86077971 h: refs/heads/master i:   128587:
 abb8bdab3f598ac1abfd17681ac523eccde998d9 v: v3

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

diff --git a/[refs] b/[refs]
index a2532db81c9d..f755f979a4bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98ed51747b63435b9987ef12692a75c223818bbe
+refs/heads/master: bd09835d9aad9c7b664cddc8435cc37b86077971
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index 4957cface9ab..b801eb4b3eef 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -693,7 +693,6 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
 	u64 root_objectid = root->root_key.objectid;
 	u32 total_count = 0;
 	u32 cur_count;
-	u32 refs;
 	u32 nritems;
 	int ret;
 	struct btrfs_key key;
@@ -729,8 +728,8 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
 	}
 
 	item = btrfs_item_ptr(l, path->slots[0], struct btrfs_extent_item);
-	refs = btrfs_extent_refs(l, item);
 	while (1) {
+		l = path->nodes[0];
 		nritems = btrfs_header_nritems(l);
 		if (path->slots[0] >= nritems) {
 			ret = btrfs_next_leaf(extent_root, path);
@@ -741,6 +740,7 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
 		btrfs_item_key_to_cpu(l, &found_key, path->slots[0]);
 		if (found_key.objectid != bytenr)
 			break;
+
 		if (found_key.type != BTRFS_EXTENT_REF_KEY) {
 			path->slots[0]++;
 			continue;
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 8a2001bbf104..6e2d03626fb9 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -208,7 +208,7 @@ static int run_delalloc_nocow(struct inode *inode, u64 start, u64 end)
 		}
 
 		start = extent_end;
-	} else if (found_type == BTRFS_FILE_EXTENT_INLINE) {
+	} else {
 		goto not_found;
 	}
 loop: