This would help to reuse the function
v1->v2: removed static and updated .h file, in a preparation
work for the following patch
Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
utils.c | 18 +++++++++++++-----
utils.h | 1 +
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/utils.c b/utils.c
index f9545b8..fc3c41e 100644
--- a/utils.c
+++ b/utils.c
@@ -1313,7 +1313,7 @@ static int get_label_unmounted(const char *dev)
* mounted path rather than device. Return the corresponding error
* the user specified the device path.
*/
-static int get_label_mounted(const char *mount_path)
+int get_label_mounted(const char *mount_path, char *labelp)
{
char label[BTRFS_LABEL_SIZE];
int fd;
@@ -1331,16 +1331,24 @@ static int get_label_mounted(const char *mount_path)
return -1;
}
- fprintf(stdout, "%s\n", label);
+ strncpy(labelp, label, sizeof(label));
close(fd);
return 0;
}
int get_label(const char *btrfs_dev)
{
- return is_existing_blk_or_reg_file(btrfs_dev) ?
- get_label_unmounted(btrfs_dev) :
- get_label_mounted(btrfs_dev);
+ int ret;
+ char label[BTRFS_LABEL_SIZE];
+
+ if (is_existing_blk_or_reg_file(btrfs_dev))
+ ret = get_label_unmounted(btrfs_dev);
+ else {
+ ret = get_label_mounted(btrfs_dev, label);
+ if (!ret)
+ fprintf(stdout, "%s\n", label);
+ }
+ return ret;
}
int set_label(const char *btrfs_dev, const char *label)
diff --git a/utils.h b/utils.h
index 733d13b..1fa1c5a 100644
--- a/utils.h
+++ b/utils.h
@@ -69,4 +69,5 @@ u64 btrfs_device_size(int fd, struct stat *st);
#define strncpy_null(dest, src) __strncpy__null(dest, src, sizeof(dest))
int test_dev_for_mkfs(char *file, int force_overwrite, char *estr);
int scan_for_btrfs(int where, int update_kernel);
+int get_label_mounted(const char *mount_path, char *labelp);
#endif
--
1.8.1.227.g44fe835
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
