RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-23 22:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Btrfs-progs: make get_subvol_name non cmds-send specific

Browse Source 
get_subvol_name can be used other than the just with in cmds-send.c
so this patch will make it possible with out changing the original
intentions.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
This commit is contained in:
Anand Jain 2013-02-01 15:56:27 +08:00 committed by David Sterba
parent e260954a9e
commit 16ef0a0c3c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmds-send.c
View File

@ -334,12 +334,12 @@ out:
return ret;
}
static const char *get_subvol_name(struct btrfs_send *s, const char *full_path)
char *get_subvol_name(char *mnt, char *full_path)
{
int len = strlen(s->root_path);
int len = strlen(mnt);
if (!len)
return full_path;
if (s->root_path[len - 1] != '/')
if (mnt[len - 1] != '/')
len += 1;
return full_path + len;
@ -449,7 +449,7 @@ int cmd_send_start(int argc, char **argv)
if (ret < 0)
goto out;
ret = get_root_id(&send, get_subvol_name(&send, subvol),
ret = get_root_id(&send, get_subvol_name(send.root_path, subvol),
&root_id);
if (ret < 0) {
fprintf(stderr, "ERROR: could not resolve "
@ -526,7 +526,7 @@ int cmd_send_start(int argc, char **argv)
if (snapshot_parent != NULL) {
ret = get_root_id(&send,
get_subvol_name(&send, snapshot_parent),
get_subvol_name(send.root_path, snapshot_parent),
&parent_root_id);
if (ret < 0) {
fprintf(stderr, "ERROR: could not resolve root_id "
@ -585,7 +585,7 @@ int cmd_send_start(int argc, char **argv)
goto out;
}
ret = get_root_id(&send, get_subvol_name(&send, subvol),
ret = get_root_id(&send, get_subvol_name(send.root_path, subvol),
&root_id);
if (ret < 0) {
fprintf(stderr, "ERROR: could not resolve root_id "

1
commands.h
View File

@ -111,3 +111,4 @@ int test_issubvolume(char *path);
/* send.c */
int find_mount_root(const char *path, char **mount_root);
char *get_subvol_name(char *mnt, char *full_path);