From 1c85c3de5aab997ff66ea95cb0f2c9f79726ec40 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 31 Oct 2016 10:38:31 +0100 Subject: btrfs-progs: use existing rootid resolving helper in btrfs_list_get_path_rootid The utils helper is not verbose in case of an error, for now the helper used for subvolume listing will print the error message but not duplicate the ioctl anymore. Signed-off-by: David Sterba --- btrfs-list.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'btrfs-list.c') diff --git a/btrfs-list.c b/btrfs-list.c index b5d4458b..831b13d3 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -1888,19 +1888,12 @@ int btrfs_list_parse_filter_string(char *opt_arg, int btrfs_list_get_path_rootid(int fd, u64 *treeid) { - int ret; - struct btrfs_ioctl_ino_lookup_args args; - - memset(&args, 0, sizeof(args)); - args.objectid = BTRFS_FIRST_FREE_OBJECTID; + int ret; - ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP, &args); - if (ret < 0) { - fprintf(stderr, - "ERROR: can't perform the search - %s\n", + ret = lookup_path_rootid(fd, treeid); + if (ret < 0) + error("cannot resolve rootid for path: %s", strerror(errno)); - return ret; - } - *treeid = args.treeid; - return 0; + + return ret; } -- cgit v1.2.3