btrfs: move btrfs_next_old_item into ctree.c

This uses btrfs_header_nritems, which I will be moving out of ctree.h.
In order to avoid needing to include the relevant header in ctree.h,
simply move this helper function into ctree.c.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ rename parameters ]
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 4f2d367e12077a831a59e8d87b624e2d53f37457..5f461e05cc9c2b6874cb2b1144d8d23a77e2f1a0 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -4852,6 +4852,14 @@ done:
        return ret;
 }
 
+int btrfs_next_old_item(struct btrfs_root *root, struct btrfs_path *path, u64 time_seq)
+{
+       path->slots[0]++;
+       if (path->slots[0] >= btrfs_header_nritems(path->nodes[0]))
+               return btrfs_next_old_leaf(root, path, time_seq);
+       return 0;
+}
+
 /*
  * this uses btrfs_prev_leaf to walk backwards in the tree, and keeps
  * searching until it gets past min_objectid or finds an item of 'type'

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index ca5c67b2c0253029e1fa59fd9b5d0c2b16f8eb83..c8ced88f214322083ff8802e062d103efcc8a93c 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2821,14 +2821,7 @@ int btrfs_get_next_valid_item(struct btrfs_root *root, struct btrfs_key *key,
                (path)->slots[0]++                                              \
        )
 
-static inline int btrfs_next_old_item(struct btrfs_root *root,
-                                     struct btrfs_path *p, u64 time_seq)
-{
-       ++p->slots[0];
-       if (p->slots[0] >= btrfs_header_nritems(p->nodes[0]))
-               return btrfs_next_old_leaf(root, p, time_seq);
-       return 0;
-}
+int btrfs_next_old_item(struct btrfs_root *root, struct btrfs_path *path, u64 time_seq);
 
 /*
  * Search the tree again to find a leaf with greater keys.