From 37288902fca5a3662620de544eca9dd3b6d6964b Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Mon, 21 Mar 2016 15:21:05 +0800 Subject: [PATCH] btrfs-progs: rename get_subvol_name() to subvol_strip_mountpoint() Signed-off-by: Anand Jain [ renamed from subvol_minus_mnt to subvol_strip_mountpoint ] Signed-off-by: David Sterba --- cmds-send.c | 9 +++++---- utils.c | 4 ++-- utils.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmds-send.c b/cmds-send.c index 7605ed9..bbe16d8 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; diff --git a/utils.c b/utils.c index dd2ff9c..06efcab 100644 --- a/utils.c +++ b/utils.c @@ -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) diff --git a/utils.h b/utils.h index 09bd3b3..ae498a4 100644 --- a/utils.h +++ b/utils.h @@ -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); /* -- 2.7.4