summaryrefslogtreecommitdiff
path: root/cmds-receive.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-10-31 10:38:31 +0100
committerDavid Sterba <dsterba@suse.com>2016-11-09 13:47:28 +0100
commit1c85c3de5aab997ff66ea95cb0f2c9f79726ec40 (patch)
tree48089000f1128679f762ab9f5e9b9a5f91835718 /cmds-receive.c
parent49cb98e5d6989055860eee06879c10896489062f (diff)
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 <dsterba@suse.com>
Diffstat (limited to 'cmds-receive.c')
-rw-r--r--cmds-receive.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/cmds-receive.c b/cmds-receive.c
index d0525bfb..62a79850 100644
--- a/cmds-receive.c
+++ b/cmds-receive.c
@@ -1106,11 +1106,8 @@ static int do_receive(struct btrfs_receive *r, const char *tomnt,
* subvols we want to receive in.
*/
ret = btrfs_list_get_path_rootid(r->mnt_fd, &subvol_id);
- if (ret) {
- error("cannot resolve our subvolid: %d",
- ret);
+ if (ret)
goto out;
- }
root_subvol_path[0] = 0;
ret = btrfs_subvolid_resolve(r->mnt_fd, root_subvol_path,