RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Anand Jain 2013-10-22 13:53:21 +08:00 committed by Chris Mason
parent f3fb002051
commit 811e993db4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils.c
View File

@ -692,7 +692,8 @@ int is_block_device(const char *path) {
* On failure, returns -errno (not mounted yields -EINVAL) * On failure, returns -errno (not mounted yields -EINVAL)
* Is noisy on failures, expects to be given a mounted device. * 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 ret;
int fd = -1; 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); ret = check_mounted_where(fd, dev, mp, mp_size, NULL);
if (!ret) { if (!ret) {
fprintf(stderr, "%s is not a mounted btrfs device\n", dev);
ret = -EINVAL; ret = -EINVAL;
} else { /* mounted, all good */ } else { /* mounted, all good */
ret = 0; ret = 0;
@ -725,8 +725,6 @@ static int get_btrfs_mount(const char *dev, char *mp, size_t mp_size) {
out: out:
if (fd != -1) if (fd != -1)
close(fd); close(fd);
if (ret)
fprintf(stderr, "Could not get mountpoint for %s\n", dev);
return ret; return ret;
} }

1
utils.h
View File

@ -91,5 +91,6 @@ int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
int ask_user(char *question); int ask_user(char *question);
int lookup_ino_rootid(int fd, u64 *rootid); int lookup_ino_rootid(int fd, u64 *rootid);
int btrfs_scan_lblkid(int update_kernel); int btrfs_scan_lblkid(int update_kernel);
int get_btrfs_mount(const char *dev, char *mp, size_t mp_size);
#endif #endif