mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

Btrfs: share the same code for __record_{new,deleted}_ref

Browse source 
This has no functional change, only picks out the same part of two functions,
and makes it shared.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
This commit is contained in:
Liu Bo 2014-03-03 21:31:03 +08:00 committed by Josef Bacik
parent fcbd2154d1
commit a4d96d6254
1 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
fs/btrfs/send.c
View file

@ -2615,7 +2615,7 @@ struct recorded_ref {
* everything mixed. So we first record all refs and later process them. * everything mixed. So we first record all refs and later process them.
* This function is a helper to record one ref. * This function is a helper to record one ref.
*/ */
static int record_ref(struct list_head *head, u64 dir, static int __record_ref(struct list_head *head, u64 dir,
u64 dir_gen, struct fs_path *path) u64 dir_gen, struct fs_path *path)
{ {
struct recorded_ref *ref; struct recorded_ref *ref;
@ -3555,9 +3555,8 @@ verbose_printk("btrfs: process_recorded_refs %llu\n", sctx->cur_ino);
return ret; return ret;
} }
static int __record_new_ref(int num, u64 dir, int index, static int record_ref(struct btrfs_root *root, int num, u64 dir, int index,
struct fs_path *name, struct fs_path *name, void *ctx, struct list_head *refs)
void *ctx)
{ {
int ret = 0; int ret = 0;
struct send_ctx *sctx = ctx; struct send_ctx *sctx = ctx;
@ -3568,7 +3567,7 @@ static int __record_new_ref(int num, u64 dir, int index,
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
ret = get_inode_info(sctx->send_root, dir, NULL, &gen, NULL, NULL, ret = get_inode_info(root, dir, NULL, &gen, NULL, NULL,
NULL, NULL); NULL, NULL);
if (ret < 0) if (ret < 0)
goto out; goto out;
@ -3580,7 +3579,7 @@ static int __record_new_ref(int num, u64 dir, int index,
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = record_ref(&sctx->new_refs, dir, gen, p); ret = __record_ref(refs, dir, gen, p);
out: out:
if (ret) if (ret)
@ -3588,37 +3587,23 @@ static int __record_new_ref(int num, u64 dir, int index,
return ret; return ret;
} }
static int __record_new_ref(int num, u64 dir, int index,
struct fs_path *name,
void *ctx)
{
struct send_ctx *sctx = ctx;
return record_ref(sctx->send_root, num, dir, index, name,
ctx, &sctx->new_refs);
}
static int __record_deleted_ref(int num, u64 dir, int index, static int __record_deleted_ref(int num, u64 dir, int index,
struct fs_path *name, struct fs_path *name,
void *ctx) void *ctx)
{ {
int ret = 0;
struct send_ctx *sctx = ctx; struct send_ctx *sctx = ctx;
struct fs_path *p; return record_ref(sctx->parent_root, num, dir, index, name,
u64 gen; ctx, &sctx->deleted_refs);
p = fs_path_alloc();
if (!p)
return -ENOMEM;
ret = get_inode_info(sctx->parent_root, dir, NULL, &gen, NULL, NULL,
NULL, NULL);
if (ret < 0)
goto out;
ret = get_cur_path(sctx, dir, gen, p);
if (ret < 0)
goto out;
ret = fs_path_add_path(p, name);
if (ret < 0)
goto out;
ret = record_ref(&sctx->deleted_refs, dir, gen, p);
out:
if (ret)
fs_path_free(p);
return ret;
} }
static int record_new_ref(struct send_ctx *sctx) static int record_new_ref(struct send_ctx *sctx)