aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/extent-tree.c4
-rw-r--r--fs/btrfs/inode.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 4957cface9ab..b801eb4b3eef 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -693,7 +693,6 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
693 u64 root_objectid = root->root_key.objectid; 693 u64 root_objectid = root->root_key.objectid;
694 u32 total_count = 0; 694 u32 total_count = 0;
695 u32 cur_count; 695 u32 cur_count;
696 u32 refs;
697 u32 nritems; 696 u32 nritems;
698 int ret; 697 int ret;
699 struct btrfs_key key; 698 struct btrfs_key key;
@@ -729,8 +728,8 @@ again:
729 } 728 }
730 729
731 item = btrfs_item_ptr(l, path->slots[0], struct btrfs_extent_item); 730 item = btrfs_item_ptr(l, path->slots[0], struct btrfs_extent_item);
732 refs = btrfs_extent_refs(l, item);
733 while (1) { 731 while (1) {
732 l = path->nodes[0];
734 nritems = btrfs_header_nritems(l); 733 nritems = btrfs_header_nritems(l);
735 if (path->slots[0] >= nritems) { 734 if (path->slots[0] >= nritems) {
736 ret = btrfs_next_leaf(extent_root, path); 735 ret = btrfs_next_leaf(extent_root, path);
@@ -741,6 +740,7 @@ again:
741 btrfs_item_key_to_cpu(l, &found_key, path->slots[0]); 740 btrfs_item_key_to_cpu(l, &found_key, path->slots[0]);
742 if (found_key.objectid != bytenr) 741 if (found_key.objectid != bytenr)
743 break; 742 break;
743
744 if (found_key.type != BTRFS_EXTENT_REF_KEY) { 744 if (found_key.type != BTRFS_EXTENT_REF_KEY) {
745 path->slots[0]++; 745 path->slots[0]++;
746 continue; 746 continue;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8a2001bbf104..6e2d03626fb9 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -208,7 +208,7 @@ again:
208 } 208 }
209 209
210 start = extent_end; 210 start = extent_end;
211 } else if (found_type == BTRFS_FILE_EXTENT_INLINE) { 211 } else {
212 goto not_found; 212 goto not_found;
213 } 213 }
214loop: 214loop: