Skip to content

L
linux
Commit 924794c9 authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by Josef Bacik
Browse files
Options

Btrfs: cleanup unused arguments in send.c 

sctx is removed from the argument of the function that
doesn't use sctx.
Signed-off-by: default avatarTsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 8f69dbd2
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 99 deletions
fs/btrfs/send.c
View file @ 924794c9
...@@ -158,7 +158,7 @@ static void fs_path_reset(struct fs_path *p) ...@@ -158,7 +158,7 @@ static void fs_path_reset(struct fs_path *p)
} }
} }
static struct fs_path *fs_path_alloc(struct send_ctx *sctx) static struct fs_path *fs_path_alloc(void)
{ {
struct fs_path *p; struct fs_path *p;
...@@ -173,11 +173,11 @@ static struct fs_path *fs_path_alloc(struct send_ctx *sctx) ...@@ -173,11 +173,11 @@ static struct fs_path *fs_path_alloc(struct send_ctx *sctx)
return p; return p;
} }
static struct fs_path *fs_path_alloc_reversed(struct send_ctx *sctx) static struct fs_path *fs_path_alloc_reversed(void)
{ {
struct fs_path *p; struct fs_path *p;
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return NULL; return NULL;
p->reversed = 1; p->reversed = 1;
...@@ -185,7 +185,7 @@ static struct fs_path *fs_path_alloc_reversed(struct send_ctx *sctx) ...@@ -185,7 +185,7 @@ static struct fs_path *fs_path_alloc_reversed(struct send_ctx *sctx)
return p; return p;
} }
static void fs_path_free(struct send_ctx *sctx, struct fs_path *p) static void fs_path_free(struct fs_path *p)
{ {
if (!p) if (!p)
return; return;
...@@ -753,8 +753,7 @@ typedef int (*iterate_inode_ref_t)(int num, u64 dir, int index, ...@@ -753,8 +753,7 @@ typedef int (*iterate_inode_ref_t)(int num, u64 dir, int index,
* *
* path must point to the INODE_REF or INODE_EXTREF when called. * path must point to the INODE_REF or INODE_EXTREF when called.
*/ */
static int iterate_inode_ref(struct send_ctx *sctx, static int iterate_inode_ref(struct btrfs_root *root, struct btrfs_path *path,
struct btrfs_root *root, struct btrfs_path *path,
struct btrfs_key *found_key, int resolve, struct btrfs_key *found_key, int resolve,
iterate_inode_ref_t iterate, void *ctx) iterate_inode_ref_t iterate, void *ctx)
{ {
...@@ -777,13 +776,13 @@ static int iterate_inode_ref(struct send_ctx *sctx, ...@@ -777,13 +776,13 @@ static int iterate_inode_ref(struct send_ctx *sctx,
unsigned long elem_size; unsigned long elem_size;
unsigned long ptr; unsigned long ptr;
p = fs_path_alloc_reversed(sctx); p = fs_path_alloc_reversed();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
tmp_path = alloc_path_for_send(); tmp_path = alloc_path_for_send();
if (!tmp_path) { if (!tmp_path) {
fs_path_free(sctx, p); fs_path_free(p);
return -ENOMEM; return -ENOMEM;
} }
...@@ -858,7 +857,7 @@ static int iterate_inode_ref(struct send_ctx *sctx, ...@@ -858,7 +857,7 @@ static int iterate_inode_ref(struct send_ctx *sctx,
out: out:
btrfs_free_path(tmp_path); btrfs_free_path(tmp_path);
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -874,8 +873,7 @@ typedef int (*iterate_dir_item_t)(int num, struct btrfs_key *di_key, ...@@ -874,8 +873,7 @@ typedef int (*iterate_dir_item_t)(int num, struct btrfs_key *di_key,
* *
* path must point to the dir item when called. * path must point to the dir item when called.
*/ */
static int iterate_dir_item(struct send_ctx *sctx, static int iterate_dir_item(struct btrfs_root *root, struct btrfs_path *path,
struct btrfs_root *root, struct btrfs_path *path,
struct btrfs_key *found_key, struct btrfs_key *found_key,
iterate_dir_item_t iterate, void *ctx) iterate_dir_item_t iterate, void *ctx)
{ {
...@@ -990,7 +988,7 @@ static int __copy_first_ref(int num, u64 dir, int index, ...@@ -990,7 +988,7 @@ static int __copy_first_ref(int num, u64 dir, int index,
* Retrieve the first path of an inode. If an inode has more then one * Retrieve the first path of an inode. If an inode has more then one
* ref/hardlink, this is ignored. * ref/hardlink, this is ignored.
*/ */
static int get_inode_path(struct send_ctx *sctx, struct btrfs_root *root, static int get_inode_path(struct btrfs_root *root,
u64 ino, struct fs_path *path) u64 ino, struct fs_path *path)
{ {
int ret; int ret;
...@@ -1022,7 +1020,7 @@ static int get_inode_path(struct send_ctx *sctx, struct btrfs_root *root, ...@@ -1022,7 +1020,7 @@ static int get_inode_path(struct send_ctx *sctx, struct btrfs_root *root,
goto out; goto out;
} }
ret = iterate_inode_ref(sctx, root, p, &found_key, 1, ret = iterate_inode_ref(root, p, &found_key, 1,
__copy_first_ref, path); __copy_first_ref, path);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -1314,8 +1312,7 @@ verbose_printk(KERN_DEBUG "btrfs: find_extent_clone: data_offset=%llu, " ...@@ -1314,8 +1312,7 @@ verbose_printk(KERN_DEBUG "btrfs: find_extent_clone: data_offset=%llu, "
return ret; return ret;
} }
static int read_symlink(struct send_ctx *sctx, static int read_symlink(struct btrfs_root *root,
struct btrfs_root *root,
u64 ino, u64 ino,
struct fs_path *dest) struct fs_path *dest)
{ {
...@@ -1562,8 +1559,7 @@ static int lookup_dir_item_inode(struct btrfs_root *root, ...@@ -1562,8 +1559,7 @@ static int lookup_dir_item_inode(struct btrfs_root *root,
* Looks up the first btrfs_inode_ref of a given ino. It returns the parent dir, * Looks up the first btrfs_inode_ref of a given ino. It returns the parent dir,
* generation of the parent dir and the name of the dir entry. * generation of the parent dir and the name of the dir entry.
*/ */
static int get_first_ref(struct send_ctx *sctx, static int get_first_ref(struct btrfs_root *root, u64 ino,
struct btrfs_root *root, u64 ino,
u64 *dir, u64 *dir_gen, struct fs_path *name) u64 *dir, u64 *dir_gen, struct fs_path *name)
{ {
int ret; int ret;
...@@ -1628,8 +1624,7 @@ static int get_first_ref(struct send_ctx *sctx, ...@@ -1628,8 +1624,7 @@ static int get_first_ref(struct send_ctx *sctx,
return ret; return ret;
} }
static int is_first_ref(struct send_ctx *sctx, static int is_first_ref(struct btrfs_root *root,
struct btrfs_root *root,
u64 ino, u64 dir, u64 ino, u64 dir,
const char *name, int name_len) const char *name, int name_len)
{ {
...@@ -1638,11 +1633,11 @@ static int is_first_ref(struct send_ctx *sctx, ...@@ -1638,11 +1633,11 @@ static int is_first_ref(struct send_ctx *sctx,
u64 tmp_dir; u64 tmp_dir;
u64 tmp_dir_gen; u64 tmp_dir_gen;
tmp_name = fs_path_alloc(sctx); tmp_name = fs_path_alloc();
if (!tmp_name) if (!tmp_name)
return -ENOMEM; return -ENOMEM;
ret = get_first_ref(sctx, root, ino, &tmp_dir, &tmp_dir_gen, tmp_name); ret = get_first_ref(root, ino, &tmp_dir, &tmp_dir_gen, tmp_name);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -1654,7 +1649,7 @@ static int is_first_ref(struct send_ctx *sctx, ...@@ -1654,7 +1649,7 @@ static int is_first_ref(struct send_ctx *sctx,
ret = !memcmp(tmp_name->start, name, name_len); ret = !memcmp(tmp_name->start, name, name_len);
out: out:
fs_path_free(sctx, tmp_name); fs_path_free(tmp_name);
return ret; return ret;
} }
...@@ -1783,11 +1778,11 @@ static int did_overwrite_first_ref(struct send_ctx *sctx, u64 ino, u64 gen) ...@@ -1783,11 +1778,11 @@ static int did_overwrite_first_ref(struct send_ctx *sctx, u64 ino, u64 gen)
if (!sctx->parent_root) if (!sctx->parent_root)
goto out; goto out;
name = fs_path_alloc(sctx); name = fs_path_alloc();
if (!name) if (!name)
return -ENOMEM; return -ENOMEM;
ret = get_first_ref(sctx, sctx->parent_root, ino, &dir, &dir_gen, name); ret = get_first_ref(sctx->parent_root, ino, &dir, &dir_gen, name);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -1795,7 +1790,7 @@ static int did_overwrite_first_ref(struct send_ctx *sctx, u64 ino, u64 gen) ...@@ -1795,7 +1790,7 @@ static int did_overwrite_first_ref(struct send_ctx *sctx, u64 ino, u64 gen)
name->start, fs_path_len(name)); name->start, fs_path_len(name));
out: out:
fs_path_free(sctx, name); fs_path_free(name);
return ret; return ret;
} }
...@@ -1979,10 +1974,10 @@ static int __get_cur_name_and_parent(struct send_ctx *sctx, ...@@ -1979,10 +1974,10 @@ static int __get_cur_name_and_parent(struct send_ctx *sctx,
* send_root or parent_root for ref lookup. * send_root or parent_root for ref lookup.
*/ */
if (ino < sctx->send_progress) if (ino < sctx->send_progress)
ret = get_first_ref(sctx, sctx->send_root, ino, ret = get_first_ref(sctx->send_root, ino,
parent_ino, parent_gen, dest); parent_ino, parent_gen, dest);
else else
ret = get_first_ref(sctx, sctx->parent_root, ino, ret = get_first_ref(sctx->parent_root, ino,
parent_ino, parent_gen, dest); parent_ino, parent_gen, dest);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -2070,7 +2065,7 @@ static int get_cur_path(struct send_ctx *sctx, u64 ino, u64 gen, ...@@ -2070,7 +2065,7 @@ static int get_cur_path(struct send_ctx *sctx, u64 ino, u64 gen,
u64 parent_gen = 0; u64 parent_gen = 0;
int stop = 0; int stop = 0;
name = fs_path_alloc(sctx); name = fs_path_alloc();
if (!name) { if (!name) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
...@@ -2098,7 +2093,7 @@ static int get_cur_path(struct send_ctx *sctx, u64 ino, u64 gen, ...@@ -2098,7 +2093,7 @@ static int get_cur_path(struct send_ctx *sctx, u64 ino, u64 gen,
} }
out: out:
fs_path_free(sctx, name); fs_path_free(name);
if (!ret) if (!ret)
fs_path_unreverse(dest); fs_path_unreverse(dest);
return ret; return ret;
...@@ -2263,7 +2258,7 @@ static int send_truncate(struct send_ctx *sctx, u64 ino, u64 gen, u64 size) ...@@ -2263,7 +2258,7 @@ static int send_truncate(struct send_ctx *sctx, u64 ino, u64 gen, u64 size)
verbose_printk("btrfs: send_truncate %llu size=%llu\n", ino, size); verbose_printk("btrfs: send_truncate %llu size=%llu\n", ino, size);
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -2281,7 +2276,7 @@ verbose_printk("btrfs: send_truncate %llu size=%llu\n", ino, size); ...@@ -2281,7 +2276,7 @@ verbose_printk("btrfs: send_truncate %llu size=%llu\n", ino, size);
tlv_put_failure: tlv_put_failure:
out: out:
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -2292,7 +2287,7 @@ static int send_chmod(struct send_ctx *sctx, u64 ino, u64 gen, u64 mode) ...@@ -2292,7 +2287,7 @@ static int send_chmod(struct send_ctx *sctx, u64 ino, u64 gen, u64 mode)
verbose_printk("btrfs: send_chmod %llu mode=%llu\n", ino, mode); verbose_printk("btrfs: send_chmod %llu mode=%llu\n", ino, mode);
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -2310,7 +2305,7 @@ verbose_printk("btrfs: send_chmod %llu mode=%llu\n", ino, mode); ...@@ -2310,7 +2305,7 @@ verbose_printk("btrfs: send_chmod %llu mode=%llu\n", ino, mode);
tlv_put_failure: tlv_put_failure:
out: out:
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -2321,7 +2316,7 @@ static int send_chown(struct send_ctx *sctx, u64 ino, u64 gen, u64 uid, u64 gid) ...@@ -2321,7 +2316,7 @@ static int send_chown(struct send_ctx *sctx, u64 ino, u64 gen, u64 uid, u64 gid)
verbose_printk("btrfs: send_chown %llu uid=%llu, gid=%llu\n", ino, uid, gid); verbose_printk("btrfs: send_chown %llu uid=%llu, gid=%llu\n", ino, uid, gid);
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -2340,7 +2335,7 @@ verbose_printk("btrfs: send_chown %llu uid=%llu, gid=%llu\n", ino, uid, gid); ...@@ -2340,7 +2335,7 @@ verbose_printk("btrfs: send_chown %llu uid=%llu, gid=%llu\n", ino, uid, gid);
tlv_put_failure: tlv_put_failure:
out: out:
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -2356,7 +2351,7 @@ static int send_utimes(struct send_ctx *sctx, u64 ino, u64 gen) ...@@ -2356,7 +2351,7 @@ static int send_utimes(struct send_ctx *sctx, u64 ino, u64 gen)
verbose_printk("btrfs: send_utimes %llu\n", ino); verbose_printk("btrfs: send_utimes %llu\n", ino);
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -2397,7 +2392,7 @@ verbose_printk("btrfs: send_utimes %llu\n", ino); ...@@ -2397,7 +2392,7 @@ verbose_printk("btrfs: send_utimes %llu\n", ino);
tlv_put_failure: tlv_put_failure:
out: out:
fs_path_free(sctx, p); fs_path_free(p);
btrfs_free_path(path); btrfs_free_path(path);
return ret; return ret;
} }
...@@ -2418,7 +2413,7 @@ static int send_create_inode(struct send_ctx *sctx, u64 ino) ...@@ -2418,7 +2413,7 @@ static int send_create_inode(struct send_ctx *sctx, u64 ino)
verbose_printk("btrfs: send_create_inode %llu\n", ino); verbose_printk("btrfs: send_create_inode %llu\n", ino);
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -2459,7 +2454,7 @@ verbose_printk("btrfs: send_create_inode %llu\n", ino); ...@@ -2459,7 +2454,7 @@ verbose_printk("btrfs: send_create_inode %llu\n", ino);
if (S_ISLNK(mode)) { if (S_ISLNK(mode)) {
fs_path_reset(p); fs_path_reset(p);
ret = read_symlink(sctx, sctx->send_root, ino, p); ret = read_symlink(sctx->send_root, ino, p);
if (ret < 0) if (ret < 0)
goto out; goto out;
TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH_LINK, p); TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH_LINK, p);
...@@ -2476,7 +2471,7 @@ verbose_printk("btrfs: send_create_inode %llu\n", ino); ...@@ -2476,7 +2471,7 @@ verbose_printk("btrfs: send_create_inode %llu\n", ino);
tlv_put_failure: tlv_put_failure:
out: out:
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -2615,13 +2610,13 @@ static int record_ref(struct list_head *head, u64 dir, ...@@ -2615,13 +2610,13 @@ static int record_ref(struct list_head *head, u64 dir,
return 0; return 0;
} }
static void __free_recorded_refs(struct send_ctx *sctx, struct list_head *head) static void __free_recorded_refs(struct list_head *head)
{ {
struct recorded_ref *cur; struct recorded_ref *cur;
while (!list_empty(head)) { while (!list_empty(head)) {
cur = list_entry(head->next, struct recorded_ref, list); cur = list_entry(head->next, struct recorded_ref, list);
fs_path_free(sctx, cur->full_path); fs_path_free(cur->full_path);
list_del(&cur->list); list_del(&cur->list);
kfree(cur); kfree(cur);
} }
...@@ -2629,8 +2624,8 @@ static void __free_recorded_refs(struct send_ctx *sctx, struct list_head *head) ...@@ -2629,8 +2624,8 @@ static void __free_recorded_refs(struct send_ctx *sctx, struct list_head *head)
static void free_recorded_refs(struct send_ctx *sctx) static void free_recorded_refs(struct send_ctx *sctx)
{ {
__free_recorded_refs(sctx, &sctx->new_refs); __free_recorded_refs(&sctx->new_refs);
__free_recorded_refs(sctx, &sctx->deleted_refs); __free_recorded_refs(&sctx->deleted_refs);
} }
/* /*
...@@ -2644,7 +2639,7 @@ static int orphanize_inode(struct send_ctx *sctx, u64 ino, u64 gen, ...@@ -2644,7 +2639,7 @@ static int orphanize_inode(struct send_ctx *sctx, u64 ino, u64 gen,
int ret; int ret;
struct fs_path *orphan; struct fs_path *orphan;
orphan = fs_path_alloc(sctx); orphan = fs_path_alloc();
if (!orphan) if (!orphan)
return -ENOMEM; return -ENOMEM;
...@@ -2655,7 +2650,7 @@ static int orphanize_inode(struct send_ctx *sctx, u64 ino, u64 gen, ...@@ -2655,7 +2650,7 @@ static int orphanize_inode(struct send_ctx *sctx, u64 ino, u64 gen,
ret = send_rename(sctx, path, orphan); ret = send_rename(sctx, path, orphan);
out: out:
fs_path_free(sctx, orphan); fs_path_free(orphan);
return ret; return ret;
} }
...@@ -2746,7 +2741,7 @@ verbose_printk("btrfs: process_recorded_refs %llu\n", sctx->cur_ino); ...@@ -2746,7 +2741,7 @@ verbose_printk("btrfs: process_recorded_refs %llu\n", sctx->cur_ino);
*/ */
BUG_ON(sctx->cur_ino <= BTRFS_FIRST_FREE_OBJECTID); BUG_ON(sctx->cur_ino <= BTRFS_FIRST_FREE_OBJECTID);
valid_path = fs_path_alloc(sctx); valid_path = fs_path_alloc();
if (!valid_path) { if (!valid_path) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
...@@ -2843,7 +2838,7 @@ verbose_printk("btrfs: process_recorded_refs %llu\n", sctx->cur_ino); ...@@ -2843,7 +2838,7 @@ verbose_printk("btrfs: process_recorded_refs %llu\n", sctx->cur_ino);
if (ret < 0) if (ret < 0)
goto out; goto out;
if (ret) { if (ret) {
ret = is_first_ref(sctx, sctx->parent_root, ret = is_first_ref(sctx->parent_root,
ow_inode, cur->dir, cur->name, ow_inode, cur->dir, cur->name,
cur->name_len); cur->name_len);
if (ret < 0) if (ret < 0)
...@@ -3024,7 +3019,7 @@ verbose_printk("btrfs: process_recorded_refs %llu\n", sctx->cur_ino); ...@@ -3024,7 +3019,7 @@ verbose_printk("btrfs: process_recorded_refs %llu\n", sctx->cur_ino);
out: out:
free_recorded_refs(sctx); free_recorded_refs(sctx);
ulist_free(check_dirs); ulist_free(check_dirs);
fs_path_free(sctx, valid_path); fs_path_free(valid_path);
return ret; return ret;
} }
...@@ -3037,7 +3032,7 @@ static int __record_new_ref(int num, u64 dir, int index, ...@@ -3037,7 +3032,7 @@ static int __record_new_ref(int num, u64 dir, int index,
struct fs_path *p; struct fs_path *p;
u64 gen; u64 gen;
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -3057,7 +3052,7 @@ static int __record_new_ref(int num, u64 dir, int index, ...@@ -3057,7 +3052,7 @@ static int __record_new_ref(int num, u64 dir, int index,
out: out:
if (ret) if (ret)
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -3070,7 +3065,7 @@ static int __record_deleted_ref(int num, u64 dir, int index, ...@@ -3070,7 +3065,7 @@ static int __record_deleted_ref(int num, u64 dir, int index,
struct fs_path *p; struct fs_path *p;
u64 gen; u64 gen;
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -3090,7 +3085,7 @@ static int __record_deleted_ref(int num, u64 dir, int index, ...@@ -3090,7 +3085,7 @@ static int __record_deleted_ref(int num, u64 dir, int index,
out: out:
if (ret) if (ret)
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -3098,7 +3093,7 @@ static int record_new_ref(struct send_ctx *sctx) ...@@ -3098,7 +3093,7 @@ static int record_new_ref(struct send_ctx *sctx)
{ {
int ret; int ret;
ret = iterate_inode_ref(sctx, sctx->send_root, sctx->left_path, ret = iterate_inode_ref(sctx->send_root, sctx->left_path,
sctx->cmp_key, 0, __record_new_ref, sctx); sctx->cmp_key, 0, __record_new_ref, sctx);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -3112,7 +3107,7 @@ static int record_deleted_ref(struct send_ctx *sctx) ...@@ -3112,7 +3107,7 @@ static int record_deleted_ref(struct send_ctx *sctx)
{ {
int ret; int ret;
ret = iterate_inode_ref(sctx, sctx->parent_root, sctx->right_path, ret = iterate_inode_ref(sctx->parent_root, sctx->right_path,
sctx->cmp_key, 0, __record_deleted_ref, sctx); sctx->cmp_key, 0, __record_deleted_ref, sctx);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -3142,8 +3137,7 @@ static int __find_iref(int num, u64 dir, int index, ...@@ -3142,8 +3137,7 @@ static int __find_iref(int num, u64 dir, int index,
return 0; return 0;
} }
static int find_iref(struct send_ctx *sctx, static int find_iref(struct btrfs_root *root,
struct btrfs_root *root,
struct btrfs_path *path, struct btrfs_path *path,
struct btrfs_key *key, struct btrfs_key *key,
u64 dir, struct fs_path *name) u64 dir, struct fs_path *name)
...@@ -3155,7 +3149,7 @@ static int find_iref(struct send_ctx *sctx, ...@@ -3155,7 +3149,7 @@ static int find_iref(struct send_ctx *sctx,
ctx.name = name; ctx.name = name;
ctx.found_idx = -1; ctx.found_idx = -1;
ret = iterate_inode_ref(sctx, root, path, key, 0, __find_iref, &ctx); ret = iterate_inode_ref(root, path, key, 0, __find_iref, &ctx);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -3172,7 +3166,7 @@ static int __record_changed_new_ref(int num, u64 dir, int index, ...@@ -3172,7 +3166,7 @@ static int __record_changed_new_ref(int num, u64 dir, int index,
int ret; int ret;
struct send_ctx *sctx = ctx; struct send_ctx *sctx = ctx;
ret = find_iref(sctx, sctx->parent_root, sctx->right_path, ret = find_iref(sctx->parent_root, sctx->right_path,
sctx->cmp_key, dir, name); sctx->cmp_key, dir, name);
if (ret == -ENOENT) if (ret == -ENOENT)
ret = __record_new_ref(num, dir, index, name, sctx); ret = __record_new_ref(num, dir, index, name, sctx);
...@@ -3189,7 +3183,7 @@ static int __record_changed_deleted_ref(int num, u64 dir, int index, ...@@ -3189,7 +3183,7 @@ static int __record_changed_deleted_ref(int num, u64 dir, int index,
int ret; int ret;
struct send_ctx *sctx = ctx; struct send_ctx *sctx = ctx;
ret = find_iref(sctx, sctx->send_root, sctx->left_path, sctx->cmp_key, ret = find_iref(sctx->send_root, sctx->left_path, sctx->cmp_key,
dir, name); dir, name);
if (ret == -ENOENT) if (ret == -ENOENT)
ret = __record_deleted_ref(num, dir, index, name, sctx); ret = __record_deleted_ref(num, dir, index, name, sctx);
...@@ -3203,11 +3197,11 @@ static int record_changed_ref(struct send_ctx *sctx) ...@@ -3203,11 +3197,11 @@ static int record_changed_ref(struct send_ctx *sctx)
{ {
int ret = 0; int ret = 0;
ret = iterate_inode_ref(sctx, sctx->send_root, sctx->left_path, ret = iterate_inode_ref(sctx->send_root, sctx->left_path,
sctx->cmp_key, 0, __record_changed_new_ref, sctx); sctx->cmp_key, 0, __record_changed_new_ref, sctx);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = iterate_inode_ref(sctx, sctx->parent_root, sctx->right_path, ret = iterate_inode_ref(sctx->parent_root, sctx->right_path,
sctx->cmp_key, 0, __record_changed_deleted_ref, sctx); sctx->cmp_key, 0, __record_changed_deleted_ref, sctx);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -3266,8 +3260,7 @@ static int process_all_refs(struct send_ctx *sctx, ...@@ -3266,8 +3260,7 @@ static int process_all_refs(struct send_ctx *sctx,
found_key.type != BTRFS_INODE_EXTREF_KEY)) found_key.type != BTRFS_INODE_EXTREF_KEY))
break; break;
ret = iterate_inode_ref(sctx, root, path, &found_key, 0, cb, ret = iterate_inode_ref(root, path, &found_key, 0, cb, sctx);
sctx);
btrfs_release_path(path); btrfs_release_path(path);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -3335,7 +3328,7 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key, ...@@ -3335,7 +3328,7 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key,
struct fs_path *p; struct fs_path *p;
posix_acl_xattr_header dummy_acl; posix_acl_xattr_header dummy_acl;
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -3362,7 +3355,7 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key, ...@@ -3362,7 +3355,7 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key,
ret = send_set_xattr(sctx, p, name, name_len, data, data_len); ret = send_set_xattr(sctx, p, name, name_len, data, data_len);
out: out:
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -3375,7 +3368,7 @@ static int __process_deleted_xattr(int num, struct btrfs_key *di_key, ...@@ -3375,7 +3368,7 @@ static int __process_deleted_xattr(int num, struct btrfs_key *di_key,
struct send_ctx *sctx = ctx; struct send_ctx *sctx = ctx;
struct fs_path *p; struct fs_path *p;
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -3386,7 +3379,7 @@ static int __process_deleted_xattr(int num, struct btrfs_key *di_key, ...@@ -3386,7 +3379,7 @@ static int __process_deleted_xattr(int num, struct btrfs_key *di_key,
ret = send_remove_xattr(sctx, p, name, name_len); ret = send_remove_xattr(sctx, p, name, name_len);
out: out:
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -3394,7 +3387,7 @@ static int process_new_xattr(struct send_ctx *sctx) ...@@ -3394,7 +3387,7 @@ static int process_new_xattr(struct send_ctx *sctx)
{ {
int ret = 0; int ret = 0;
ret = iterate_dir_item(sctx, sctx->send_root, sctx->left_path, ret = iterate_dir_item(sctx->send_root, sctx->left_path,
sctx->cmp_key, __process_new_xattr, sctx); sctx->cmp_key, __process_new_xattr, sctx);
return ret; return ret;
...@@ -3404,7 +3397,7 @@ static int process_deleted_xattr(struct send_ctx *sctx) ...@@ -3404,7 +3397,7 @@ static int process_deleted_xattr(struct send_ctx *sctx)
{ {
int ret; int ret;
ret = iterate_dir_item(sctx, sctx->parent_root, sctx->right_path, ret = iterate_dir_item(sctx->parent_root, sctx->right_path,
sctx->cmp_key, __process_deleted_xattr, sctx); sctx->cmp_key, __process_deleted_xattr, sctx);
return ret; return ret;
...@@ -3438,8 +3431,7 @@ static int __find_xattr(int num, struct btrfs_key *di_key, ...@@ -3438,8 +3431,7 @@ static int __find_xattr(int num, struct btrfs_key *di_key,
return 0; return 0;
} }
static int find_xattr(struct send_ctx *sctx, static int find_xattr(struct btrfs_root *root,
struct btrfs_root *root,
struct btrfs_path *path, struct btrfs_path *path,
struct btrfs_key *key, struct btrfs_key *key,
const char *name, int name_len, const char *name, int name_len,
...@@ -3454,7 +3446,7 @@ static int find_xattr(struct send_ctx *sctx, ...@@ -3454,7 +3446,7 @@ static int find_xattr(struct send_ctx *sctx,
ctx.found_data = NULL; ctx.found_data = NULL;
ctx.found_data_len = 0; ctx.found_data_len = 0;
ret = iterate_dir_item(sctx, root, path, key, __find_xattr, &ctx); ret = iterate_dir_item(root, path, key, __find_xattr, &ctx);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -3480,7 +3472,7 @@ static int __process_changed_new_xattr(int num, struct btrfs_key *di_key, ...@@ -3480,7 +3472,7 @@ static int __process_changed_new_xattr(int num, struct btrfs_key *di_key,
char *found_data = NULL; char *found_data = NULL;
int found_data_len = 0; int found_data_len = 0;
ret = find_xattr(sctx, sctx->parent_root, sctx->right_path, ret = find_xattr(sctx->parent_root, sctx->right_path,
sctx->cmp_key, name, name_len, &found_data, sctx->cmp_key, name, name_len, &found_data,
&found_data_len); &found_data_len);
if (ret == -ENOENT) { if (ret == -ENOENT) {
...@@ -3508,7 +3500,7 @@ static int __process_changed_deleted_xattr(int num, struct btrfs_key *di_key, ...@@ -3508,7 +3500,7 @@ static int __process_changed_deleted_xattr(int num, struct btrfs_key *di_key,
int ret; int ret;
struct send_ctx *sctx = ctx; struct send_ctx *sctx = ctx;
ret = find_xattr(sctx, sctx->send_root, sctx->left_path, sctx->cmp_key, ret = find_xattr(sctx->send_root, sctx->left_path, sctx->cmp_key,
name, name_len, NULL, NULL); name, name_len, NULL, NULL);
if (ret == -ENOENT) if (ret == -ENOENT)
ret = __process_deleted_xattr(num, di_key, name, name_len, data, ret = __process_deleted_xattr(num, di_key, name, name_len, data,
...@@ -3523,11 +3515,11 @@ static int process_changed_xattr(struct send_ctx *sctx) ...@@ -3523,11 +3515,11 @@ static int process_changed_xattr(struct send_ctx *sctx)
{ {
int ret = 0; int ret = 0;
ret = iterate_dir_item(sctx, sctx->send_root, sctx->left_path, ret = iterate_dir_item(sctx->send_root, sctx->left_path,
sctx->cmp_key, __process_changed_new_xattr, sctx); sctx->cmp_key, __process_changed_new_xattr, sctx);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = iterate_dir_item(sctx, sctx->parent_root, sctx->right_path, ret = iterate_dir_item(sctx->parent_root, sctx->right_path,
sctx->cmp_key, __process_changed_deleted_xattr, sctx); sctx->cmp_key, __process_changed_deleted_xattr, sctx);
out: out:
...@@ -3572,7 +3564,7 @@ static int process_all_new_xattrs(struct send_ctx *sctx) ...@@ -3572,7 +3564,7 @@ static int process_all_new_xattrs(struct send_ctx *sctx)
goto out; goto out;
} }
ret = iterate_dir_item(sctx, root, path, &found_key, ret = iterate_dir_item(root, path, &found_key,
__process_new_xattr, sctx); __process_new_xattr, sctx);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -3598,7 +3590,7 @@ static int send_write(struct send_ctx *sctx, u64 offset, u32 len) ...@@ -3598,7 +3590,7 @@ static int send_write(struct send_ctx *sctx, u64 offset, u32 len)
int num_read = 0; int num_read = 0;
mm_segment_t old_fs; mm_segment_t old_fs;
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -3640,7 +3632,7 @@ verbose_printk("btrfs: send_write offset=%llu, len=%d\n", offset, len); ...@@ -3640,7 +3632,7 @@ verbose_printk("btrfs: send_write offset=%llu, len=%d\n", offset, len);
tlv_put_failure: tlv_put_failure:
out: out:
fs_path_free(sctx, p); fs_path_free(p);
set_fs(old_fs); set_fs(old_fs);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -3663,7 +3655,7 @@ verbose_printk("btrfs: send_clone offset=%llu, len=%d, clone_root=%llu, " ...@@ -3663,7 +3655,7 @@ verbose_printk("btrfs: send_clone offset=%llu, len=%d, clone_root=%llu, "
clone_root->root->objectid, clone_root->ino, clone_root->root->objectid, clone_root->ino,
clone_root->offset); clone_root->offset);
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -3686,8 +3678,7 @@ verbose_printk("btrfs: send_clone offset=%llu, len=%d, clone_root=%llu, " ...@@ -3686,8 +3678,7 @@ verbose_printk("btrfs: send_clone offset=%llu, len=%d, clone_root=%llu, "
goto out; goto out;
ret = get_cur_path(sctx, clone_root->ino, gen, p); ret = get_cur_path(sctx, clone_root->ino, gen, p);
} else { } else {
ret = get_inode_path(sctx, clone_root->root, ret = get_inode_path(clone_root->root, clone_root->ino, p);
clone_root->ino, p);
} }
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -3704,7 +3695,7 @@ verbose_printk("btrfs: send_clone offset=%llu, len=%d, clone_root=%llu, " ...@@ -3704,7 +3695,7 @@ verbose_printk("btrfs: send_clone offset=%llu, len=%d, clone_root=%llu, "
tlv_put_failure: tlv_put_failure:
out: out:
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
...@@ -3717,7 +3708,7 @@ static int send_update_extent(struct send_ctx *sctx, ...@@ -3717,7 +3708,7 @@ static int send_update_extent(struct send_ctx *sctx,
int ret = 0; int ret = 0;
struct fs_path *p; struct fs_path *p;
p = fs_path_alloc(sctx); p = fs_path_alloc();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
...@@ -3737,7 +3728,7 @@ static int send_update_extent(struct send_ctx *sctx, ...@@ -3737,7 +3728,7 @@ static int send_update_extent(struct send_ctx *sctx,
tlv_put_failure: tlv_put_failure:
out: out:
fs_path_free(sctx, p); fs_path_free(p);
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7