[PATCH v4 41/46] btrfs: move inode_to_path higher in backref.c

Josef Bacik
2023-12-01T22:12:49Z

We have a prototype and then the definition lower below, we don't need
to do this, simply move the function to where the prototype is.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/backref.c | 69 ++++++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index beed7e459dab..f58fe7c745c2 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -2578,8 +2578,40 @@ int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info,
build_ino_list, ctx);
}

+/*
+ * returns 0 if the path could be dumped (probably truncated)
+ * returns <0 in case of an error
+ */
static int inode_to_path(u64 inum, u32 name_len, unsigned long name_off,
- struct extent_buffer *eb, struct inode_fs_paths *ipath);
+ struct extent_buffer *eb, struct inode_fs_paths *ipath)
+{
+ char *fspath;
+ char *fspath_min;
+ int i = ipath->fspath->elem_cnt;
+ const int s_ptr = sizeof(char *);
+ u32 bytes_left;
+
+ bytes_left = ipath->fspath->bytes_left > s_ptr ?
+ ipath->fspath->bytes_left - s_ptr : 0;
+
+ fspath_min = (char *)ipath->fspath->val + (i + 1) * s_ptr;
+ fspath = btrfs_ref_to_path(ipath->fs_root, ipath->btrfs_path, name_len,
+ name_off, eb, inum, fspath_min, bytes_left);
+ if (IS_ERR(fspath))
+ return PTR_ERR(fspath);
+
+ if (fspath > fspath_min) {
+ ipath->fspath->val[i] = (u64)(unsigned long)fspath;
+ ++ipath->fspath->elem_cnt;
+ ipath->fspath->bytes_left = fspath - fspath_min;
+ } else {
+ ++ipath->fspath->elem_missed;
+ ipath->fspath->bytes_missing += fspath_min - fspath;
+ ipath->fspath->bytes_left = 0;
+ }
+
+ return 0;
+}

static int iterate_inode_refs(u64 inum, struct inode_fs_paths *ipath)
{
@@ -2704,41 +2736,6 @@ static int iterate_inode_extrefs(u64 inum, struct inode_fs_paths *ipath)
return ret;
}

-/*
- * returns 0 if the path could be dumped (probably truncated)
- * returns <0 in case of an error
- */
-static int inode_to_path(u64 inum, u32 name_len, unsigned long name_off,
- struct extent_buffer *eb, struct inode_fs_paths *ipath)
-{
- char *fspath;
- char *fspath_min;
- int i = ipath->fspath->elem_cnt;
- const int s_ptr = sizeof(char *);
- u32 bytes_left;
-
- bytes_left = ipath->fspath->bytes_left > s_ptr ?
- ipath->fspath->bytes_left - s_ptr : 0;
-
- fspath_min = (char *)ipath->fspath->val + (i + 1) * s_ptr;
- fspath = btrfs_ref_to_path(ipath->fs_root, ipath->btrfs_path, name_len,
- name_off, eb, inum, fspath_min, bytes_left);
- if (IS_ERR(fspath))
- return PTR_ERR(fspath);
-
- if (fspath > fspath_min) {
- ipath->fspath->val[i] = (u64)(unsigned long)fspath;
- ++ipath->fspath->elem_cnt;
- ipath->fspath->bytes_left = fspath - fspath_min;
- } else {
- ++ipath->fspath->elem_missed;
- ipath->fspath->bytes_missing += fspath_min - fspath;
- ipath->fspath->bytes_left = 0;
- }
-
- return 0;
-}
-
/*
* this dumps all file system paths to the inode into the ipath struct, provided
* is has been created large enough. each path is zero-terminated and accessed
--
2.41.0