diff options
author | Anand Jain <Anand.Jain@oracle.com> | 2013-10-22 13:53:21 +0800 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-10-24 05:57:44 -0400 |
commit | 811e993db4f447e577c87fb2a0539eb723798685 (patch) | |
tree | 34d9cc767ce54beedd5488d03e0872ee7d3041c3 | |
parent | f3fb0020517838993d643fcee1987db918848979 (diff) |
btrfs-progs: make get_btrfs_mount callable
get_btrfs_mount is reusable function but it is printing
errors, this removes it. Here the parent function of
open_path_or_dev_mnt does print error msg on error.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
-rw-r--r-- | utils.c | 6 | ||||
-rw-r--r-- | utils.h | 1 |
2 files changed, 3 insertions, 4 deletions
@@ -692,7 +692,8 @@ int is_block_device(const char *path) { * On failure, returns -errno (not mounted yields -EINVAL) * Is noisy on failures, expects to be given a mounted device. */ -static int get_btrfs_mount(const char *dev, char *mp, size_t mp_size) { +int get_btrfs_mount(const char *dev, char *mp, size_t mp_size) +{ int ret; int fd = -1; @@ -717,7 +718,6 @@ static int get_btrfs_mount(const char *dev, char *mp, size_t mp_size) { ret = check_mounted_where(fd, dev, mp, mp_size, NULL); if (!ret) { - fprintf(stderr, "%s is not a mounted btrfs device\n", dev); ret = -EINVAL; } else { /* mounted, all good */ ret = 0; @@ -725,8 +725,6 @@ static int get_btrfs_mount(const char *dev, char *mp, size_t mp_size) { out: if (fd != -1) close(fd); - if (ret) - fprintf(stderr, "Could not get mountpoint for %s\n", dev); return ret; } @@ -91,5 +91,6 @@ int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf, int ask_user(char *question); int lookup_ino_rootid(int fd, u64 *rootid); int btrfs_scan_lblkid(int update_kernel); +int get_btrfs_mount(const char *dev, char *mp, size_t mp_size); #endif |