From 8cec21a7ed91e0d4c49f1fbe188622af0586602c Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Mon, 21 Mar 2016 15:21:03 +0800 Subject: btrfs-progs: move get_subvol_name() to utils.c Signed-off-by: Anand Jain Signed-off-by: David Sterba --- cmds-send.c | 11 ----------- utils.c | 12 ++++++++++++ utils.h | 2 ++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/cmds-send.c b/cmds-send.c index 3e34d75b..7605ed94 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -335,17 +335,6 @@ out: return ret; } -char *get_subvol_name(char *mnt, char *full_path) -{ - int len = strlen(mnt); - if (!len) - return full_path; - if (mnt[len - 1] != '/') - len += 1; - - return full_path + len; -} - static int init_root_path(struct btrfs_send *s, const char *subvol) { int ret = 0; diff --git a/utils.c b/utils.c index 1018a7c0..cd3234e1 100644 --- a/utils.c +++ b/utils.c @@ -3159,3 +3159,15 @@ int test_issubvolume(const char *path) return (int)stfs.f_type == BTRFS_SUPER_MAGIC; } + +char *get_subvol_name(char *mnt, char *full_path) +{ + int len = strlen(mnt); + if (!len) + return full_path; + + if (mnt[len - 1] != '/') + len += 1; + + return full_path + len; +} diff --git a/utils.h b/utils.h index 32bb0200..c6395b03 100644 --- a/utils.h +++ b/utils.h @@ -197,6 +197,8 @@ 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); + /* * Btrfs minimum size calculation is complicated, it should include at least: * 1. system group size -- cgit v1.2.3