mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
btrfs: send: refactor arguments of get_inode_info()
Refactor get_inode_info() to populate all wanted fields on an output structure. Besides, also introduce a helper function called get_inode_gen(), which is commonly used. Reviewed-by: Robbie Ko <robbieko@synology.com> Reviewed-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: BingJing Chang <bingjingc@synology.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
BingJing Chang
David Sterba
parent
52b029f427
commit
7e93f6dc11
1 changed files with 78 additions and 75 deletions
153
fs/btrfs/send.c
153
fs/btrfs/send.c
|
|
@ -846,17 +846,31 @@ static int send_rmdir(struct send_ctx *sctx, struct fs_path *path)
|
|||
return ret;
|
||||
}
|
||||
|
||||
struct btrfs_inode_info {
|
||||
u64 size;
|
||||
u64 gen;
|
||||
u64 mode;
|
||||
u64 uid;
|
||||
u64 gid;
|
||||
u64 rdev;
|
||||
u64 fileattr;
|
||||
};
|
||||
|
||||
/*
|
||||
* Helper function to retrieve some fields from an inode item.
|
||||
*/
|
||||
static int __get_inode_info(struct btrfs_root *root, struct btrfs_path *path,
|
||||
u64 ino, u64 *size, u64 *gen, u64 *mode, u64 *uid,
|
||||
u64 *gid, u64 *rdev, u64 *fileattr)
|
||||
static int get_inode_info(struct btrfs_root *root, u64 ino,
|
||||
struct btrfs_inode_info *info)
|
||||
{
|
||||
int ret;
|
||||
struct btrfs_path *path;
|
||||
struct btrfs_inode_item *ii;
|
||||
struct btrfs_key key;
|
||||
|
||||
path = alloc_path_for_send();
|
||||
if (!path)
|
||||
return -ENOMEM;
|
||||
|
||||
key.objectid = ino;
|
||||
key.type = BTRFS_INODE_ITEM_KEY;
|
||||
key.offset = 0;
|
||||
|
|
@ -864,47 +878,42 @@ static int __get_inode_info(struct btrfs_root *root, struct btrfs_path *path,
|
|||
if (ret) {
|
||||
if (ret > 0)
|
||||
ret = -ENOENT;
|
||||
return ret;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!info)
|
||||
goto out;
|
||||
|
||||
ii = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
||||
struct btrfs_inode_item);
|
||||
if (size)
|
||||
*size = btrfs_inode_size(path->nodes[0], ii);
|
||||
if (gen)
|
||||
*gen = btrfs_inode_generation(path->nodes[0], ii);
|
||||
if (mode)
|
||||
*mode = btrfs_inode_mode(path->nodes[0], ii);
|
||||
if (uid)
|
||||
*uid = btrfs_inode_uid(path->nodes[0], ii);
|
||||
if (gid)
|
||||
*gid = btrfs_inode_gid(path->nodes[0], ii);
|
||||
if (rdev)
|
||||
*rdev = btrfs_inode_rdev(path->nodes[0], ii);
|
||||
info->size = btrfs_inode_size(path->nodes[0], ii);
|
||||
info->gen = btrfs_inode_generation(path->nodes[0], ii);
|
||||
info->mode = btrfs_inode_mode(path->nodes[0], ii);
|
||||
info->uid = btrfs_inode_uid(path->nodes[0], ii);
|
||||
info->gid = btrfs_inode_gid(path->nodes[0], ii);
|
||||
info->rdev = btrfs_inode_rdev(path->nodes[0], ii);
|
||||
/*
|
||||
* Transfer the unchanged u64 value of btrfs_inode_item::flags, that's
|
||||
* otherwise logically split to 32/32 parts.
|
||||
*/
|
||||
if (fileattr)
|
||||
*fileattr = btrfs_inode_flags(path->nodes[0], ii);
|
||||
info->fileattr = btrfs_inode_flags(path->nodes[0], ii);
|
||||
|
||||
out:
|
||||
btrfs_free_path(path);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int get_inode_info(struct btrfs_root *root,
|
||||
u64 ino, u64 *size, u64 *gen,
|
||||
u64 *mode, u64 *uid, u64 *gid,
|
||||
u64 *rdev, u64 *fileattr)
|
||||
static int get_inode_gen(struct btrfs_root *root, u64 ino, u64 *gen)
|
||||
{
|
||||
struct btrfs_path *path;
|
||||
int ret;
|
||||
struct btrfs_inode_info info;
|
||||
|
||||
path = alloc_path_for_send();
|
||||
if (!path)
|
||||
return -ENOMEM;
|
||||
ret = __get_inode_info(root, path, ino, size, gen, mode, uid, gid,
|
||||
rdev, fileattr);
|
||||
btrfs_free_path(path);
|
||||
if (!gen)
|
||||
return -EPERM;
|
||||
|
||||
ret = get_inode_info(root, ino, &info);
|
||||
if (!ret)
|
||||
*gen = info.gen;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -1648,8 +1657,7 @@ static int get_cur_inode_state(struct send_ctx *sctx, u64 ino, u64 gen)
|
|||
u64 left_gen;
|
||||
u64 right_gen;
|
||||
|
||||
ret = get_inode_info(sctx->send_root, ino, NULL, &left_gen, NULL, NULL,
|
||||
NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->send_root, ino, &left_gen);
|
||||
if (ret < 0 && ret != -ENOENT)
|
||||
goto out;
|
||||
left_ret = ret;
|
||||
|
|
@ -1657,8 +1665,7 @@ static int get_cur_inode_state(struct send_ctx *sctx, u64 ino, u64 gen)
|
|||
if (!sctx->parent_root) {
|
||||
right_ret = -ENOENT;
|
||||
} else {
|
||||
ret = get_inode_info(sctx->parent_root, ino, NULL, &right_gen,
|
||||
NULL, NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->parent_root, ino, &right_gen);
|
||||
if (ret < 0 && ret != -ENOENT)
|
||||
goto out;
|
||||
right_ret = ret;
|
||||
|
|
@ -1820,8 +1827,7 @@ static int get_first_ref(struct btrfs_root *root, u64 ino,
|
|||
btrfs_release_path(path);
|
||||
|
||||
if (dir_gen) {
|
||||
ret = get_inode_info(root, parent_dir, NULL, dir_gen, NULL,
|
||||
NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(root, parent_dir, dir_gen);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1878,6 +1884,7 @@ static int will_overwrite_ref(struct send_ctx *sctx, u64 dir, u64 dir_gen,
|
|||
int ret = 0;
|
||||
u64 gen;
|
||||
u64 other_inode = 0;
|
||||
struct btrfs_inode_info info;
|
||||
|
||||
if (!sctx->parent_root)
|
||||
goto out;
|
||||
|
|
@ -1892,8 +1899,7 @@ static int will_overwrite_ref(struct send_ctx *sctx, u64 dir, u64 dir_gen,
|
|||
* and we can just unlink this entry.
|
||||
*/
|
||||
if (sctx->parent_root && dir != BTRFS_FIRST_FREE_OBJECTID) {
|
||||
ret = get_inode_info(sctx->parent_root, dir, NULL, &gen, NULL,
|
||||
NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->parent_root, dir, &gen);
|
||||
if (ret < 0 && ret != -ENOENT)
|
||||
goto out;
|
||||
if (ret) {
|
||||
|
|
@ -1920,13 +1926,14 @@ static int will_overwrite_ref(struct send_ctx *sctx, u64 dir, u64 dir_gen,
|
|||
*/
|
||||
if (other_inode > sctx->send_progress ||
|
||||
is_waiting_for_move(sctx, other_inode)) {
|
||||
ret = get_inode_info(sctx->parent_root, other_inode, NULL,
|
||||
who_gen, who_mode, NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_info(sctx->parent_root, other_inode, &info);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
ret = 1;
|
||||
*who_ino = other_inode;
|
||||
*who_gen = info.gen;
|
||||
*who_mode = info.mode;
|
||||
} else {
|
||||
ret = 0;
|
||||
}
|
||||
|
|
@ -1959,8 +1966,7 @@ static int did_overwrite_ref(struct send_ctx *sctx,
|
|||
goto out;
|
||||
|
||||
if (dir != BTRFS_FIRST_FREE_OBJECTID) {
|
||||
ret = get_inode_info(sctx->send_root, dir, NULL, &gen, NULL,
|
||||
NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->send_root, dir, &gen);
|
||||
if (ret < 0 && ret != -ENOENT)
|
||||
goto out;
|
||||
if (ret) {
|
||||
|
|
@ -1982,8 +1988,7 @@ static int did_overwrite_ref(struct send_ctx *sctx,
|
|||
goto out;
|
||||
}
|
||||
|
||||
ret = get_inode_info(sctx->send_root, ow_inode, NULL, &gen, NULL, NULL,
|
||||
NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->send_root, ow_inode, &gen);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
|
|
@ -2649,6 +2654,7 @@ static int send_create_inode(struct send_ctx *sctx, u64 ino)
|
|||
int ret = 0;
|
||||
struct fs_path *p;
|
||||
int cmd;
|
||||
struct btrfs_inode_info info;
|
||||
u64 gen;
|
||||
u64 mode;
|
||||
u64 rdev;
|
||||
|
|
@ -2660,10 +2666,12 @@ static int send_create_inode(struct send_ctx *sctx, u64 ino)
|
|||
return -ENOMEM;
|
||||
|
||||
if (ino != sctx->cur_ino) {
|
||||
ret = get_inode_info(sctx->send_root, ino, NULL, &gen, &mode,
|
||||
NULL, NULL, &rdev, NULL);
|
||||
ret = get_inode_info(sctx->send_root, ino, &info);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
gen = info.gen;
|
||||
mode = info.mode;
|
||||
rdev = info.rdev;
|
||||
} else {
|
||||
gen = sctx->cur_inode_gen;
|
||||
mode = sctx->cur_inode_mode;
|
||||
|
|
@ -3363,8 +3371,7 @@ static int apply_dir_move(struct send_ctx *sctx, struct pending_dir_move *pm)
|
|||
/*
|
||||
* The parent inode might have been deleted in the send snapshot
|
||||
*/
|
||||
ret = get_inode_info(sctx->send_root, cur->dir, NULL,
|
||||
NULL, NULL, NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_info(sctx->send_root, cur->dir, NULL);
|
||||
if (ret == -ENOENT) {
|
||||
ret = 0;
|
||||
continue;
|
||||
|
|
@ -3538,12 +3545,10 @@ static int wait_for_dest_dir_move(struct send_ctx *sctx,
|
|||
goto out;
|
||||
}
|
||||
|
||||
ret = get_inode_info(sctx->parent_root, di_key.objectid, NULL,
|
||||
&left_gen, NULL, NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->parent_root, di_key.objectid, &left_gen);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
ret = get_inode_info(sctx->send_root, di_key.objectid, NULL,
|
||||
&right_gen, NULL, NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->send_root, di_key.objectid, &right_gen);
|
||||
if (ret < 0) {
|
||||
if (ret == -ENOENT)
|
||||
ret = 0;
|
||||
|
|
@ -3673,8 +3678,7 @@ static int is_ancestor(struct btrfs_root *root,
|
|||
cur_offset = item_size;
|
||||
}
|
||||
|
||||
ret = get_inode_info(root, parent, NULL, &parent_gen,
|
||||
NULL, NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(root, parent, &parent_gen);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
ret = check_ino_in_path(root, ino1, ino1_gen,
|
||||
|
|
@ -3764,9 +3768,7 @@ static int wait_for_parent_move(struct send_ctx *sctx,
|
|||
memcmp(path_before->start, path_after->start, len1))) {
|
||||
u64 parent_ino_gen;
|
||||
|
||||
ret = get_inode_info(sctx->parent_root, ino, NULL,
|
||||
&parent_ino_gen, NULL, NULL, NULL,
|
||||
NULL, NULL);
|
||||
ret = get_inode_gen(sctx->parent_root, ino, &parent_ino_gen);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
if (ino_gen == parent_ino_gen) {
|
||||
|
|
@ -4445,8 +4447,7 @@ static int record_new_ref_if_needed(int num, u64 dir, int index,
|
|||
struct recorded_ref *ref;
|
||||
u64 dir_gen;
|
||||
|
||||
ret = get_inode_info(sctx->send_root, dir, NULL, &dir_gen, NULL,
|
||||
NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->send_root, dir, &dir_gen);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
|
|
@ -4476,8 +4477,7 @@ static int record_deleted_ref_if_needed(int num, u64 dir, int index,
|
|||
struct recorded_ref *ref;
|
||||
u64 dir_gen;
|
||||
|
||||
ret = get_inode_info(sctx->parent_root, dir, NULL, &dir_gen, NULL,
|
||||
NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->parent_root, dir, &dir_gen);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
|
|
@ -5138,8 +5138,7 @@ static int send_clone(struct send_ctx *sctx,
|
|||
TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);
|
||||
|
||||
if (clone_root->root == sctx->send_root) {
|
||||
ret = get_inode_info(sctx->send_root, clone_root->ino, NULL,
|
||||
&gen, NULL, NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->send_root, clone_root->ino, &gen);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
ret = get_cur_path(sctx, clone_root->ino, gen, p);
|
||||
|
|
@ -5618,6 +5617,7 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path,
|
|||
struct btrfs_path *path;
|
||||
struct btrfs_key key;
|
||||
int ret;
|
||||
struct btrfs_inode_info info;
|
||||
u64 clone_src_i_size = 0;
|
||||
|
||||
/*
|
||||
|
|
@ -5647,12 +5647,11 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path,
|
|||
* There are inodes that have extents that lie behind its i_size. Don't
|
||||
* accept clones from these extents.
|
||||
*/
|
||||
ret = __get_inode_info(clone_root->root, path, clone_root->ino,
|
||||
&clone_src_i_size, NULL, NULL, NULL, NULL, NULL,
|
||||
NULL);
|
||||
ret = get_inode_info(clone_root->root, clone_root->ino, &info);
|
||||
btrfs_release_path(path);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
clone_src_i_size = info.size;
|
||||
|
||||
/*
|
||||
* We can't send a clone operation for the entire range if we find
|
||||
|
|
@ -6341,6 +6340,7 @@ static int process_recorded_refs_if_needed(struct send_ctx *sctx, int at_end,
|
|||
static int finish_inode_if_needed(struct send_ctx *sctx, int at_end)
|
||||
{
|
||||
int ret = 0;
|
||||
struct btrfs_inode_info info;
|
||||
u64 left_mode;
|
||||
u64 left_uid;
|
||||
u64 left_gid;
|
||||
|
|
@ -6383,11 +6383,13 @@ static int finish_inode_if_needed(struct send_ctx *sctx, int at_end)
|
|||
goto out;
|
||||
if (!at_end && sctx->cmp_key->objectid == sctx->cur_ino)
|
||||
goto out;
|
||||
|
||||
ret = get_inode_info(sctx->send_root, sctx->cur_ino, NULL, NULL,
|
||||
&left_mode, &left_uid, &left_gid, NULL, &left_fileattr);
|
||||
ret = get_inode_info(sctx->send_root, sctx->cur_ino, &info);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
left_mode = info.mode;
|
||||
left_uid = info.uid;
|
||||
left_gid = info.gid;
|
||||
left_fileattr = info.fileattr;
|
||||
|
||||
if (!sctx->parent_root || sctx->cur_inode_new) {
|
||||
need_chown = 1;
|
||||
|
|
@ -6398,11 +6400,14 @@ static int finish_inode_if_needed(struct send_ctx *sctx, int at_end)
|
|||
} else {
|
||||
u64 old_size;
|
||||
|
||||
ret = get_inode_info(sctx->parent_root, sctx->cur_ino,
|
||||
&old_size, NULL, &right_mode, &right_uid,
|
||||
&right_gid, NULL, &right_fileattr);
|
||||
ret = get_inode_info(sctx->parent_root, sctx->cur_ino, &info);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
old_size = info.size;
|
||||
right_mode = info.mode;
|
||||
right_uid = info.uid;
|
||||
right_gid = info.gid;
|
||||
right_fileattr = info.fileattr;
|
||||
|
||||
if (left_uid != right_uid || left_gid != right_gid)
|
||||
need_chown = 1;
|
||||
|
|
@ -6888,13 +6893,11 @@ static int dir_changed(struct send_ctx *sctx, u64 dir)
|
|||
u64 orig_gen, new_gen;
|
||||
int ret;
|
||||
|
||||
ret = get_inode_info(sctx->send_root, dir, NULL, &new_gen, NULL, NULL,
|
||||
NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->send_root, dir, &new_gen);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = get_inode_info(sctx->parent_root, dir, NULL, &orig_gen, NULL,
|
||||
NULL, NULL, NULL, NULL);
|
||||
ret = get_inode_gen(sctx->parent_root, dir, &orig_gen);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue