diff options
| -rw-r--r-- | cmds-send.c | 9 | ||||
| -rw-r--r-- | utils.c | 4 | ||||
| -rw-r--r-- | utils.h | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/cmds-send.c b/cmds-send.c index 7605ed94..bbe16d84 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -455,8 +455,9 @@ int cmd_send(int argc, char **argv) if (ret < 0) goto out; - ret = get_root_id(&send, get_subvol_name(send.root_path, subvol), - &root_id); + ret = get_root_id(&send, + subvol_strip_mountpoint(send.root_path, subvol), + &root_id); if (ret < 0) { error("cannot resolve rootid for %s", subvol); goto out; @@ -569,8 +570,8 @@ int cmd_send(int argc, char **argv) if (snapshot_parent != NULL) { ret = get_root_id(&send, - get_subvol_name(send.root_path, snapshot_parent), - &parent_root_id); + subvol_strip_mountpoint(send.root_path, snapshot_parent), + &parent_root_id); if (ret < 0) { error("could not resolve rootid for %s", snapshot_parent); goto out; @@ -3160,7 +3160,7 @@ int test_issubvolume(const char *path) return (int)stfs.f_type == BTRFS_SUPER_MAGIC; } -char *get_subvol_name(char *mnt, char *full_path) +char *subvol_strip_mountpoint(char *mnt, char *full_path) { int len = strlen(mnt); if (!len) @@ -3206,7 +3206,7 @@ int get_subvol_info(char *fullpath, struct root_info *get_ri) return 1; } ret = 1; - svpath = get_subvol_name(mnt, fullpath); + svpath = subvol_strip_mountpoint(mnt, fullpath); fd = btrfs_open_dir(fullpath, &dirstream1, 1); if (fd < 0) @@ -198,7 +198,7 @@ int test_issubvolname(const char *name); int test_issubvolume(const char *path); int test_isdir(const char *path); -char *get_subvol_name(char *mnt, char *full_path); +char *subvol_strip_mountpoint(char *mnt, char *full_path); int get_subvol_info(char *fullpath, struct root_info *get_ri); /* |