diff options
| author | Justin Maggard <jmaggard10@gmail.com> | 2014-12-23 11:34:52 -0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2014-12-29 17:13:58 +0100 |
| commit | 7d83db5bae5420d7b1c7f4e64897c25bc9a94f09 (patch) | |
| tree | fe0d4c62b19f641a94a8f07101868a5fb6c22012 /cmds-filesystem.c | |
| parent | 0f38766b8fe9d8c5c77a707fa1d24824df09d18a (diff) | |
btrfs-progs: Fix btrfs fi show by uuid and label
Commit 8be2fff (btrfs-progs: apply realpath for btrfs fi
show when mount point is given) changed the behavior of
btrfs fi show to return an error if the call to realpath()
failed. This broke the ability to specify a filesystem by
uuid or label.
So let's not consider a failed call to realpath() as an
error. If the user really specified a bad device, just
return nothing like we did before.
Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
Reviewed-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'cmds-filesystem.c')
| -rw-r--r-- | cmds-filesystem.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 8f037dd7..a654e6f1 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -901,13 +901,8 @@ static int cmd_show(int argc, char **argv) * realpath do /mnt/btrfs/ => /mnt/btrfs * which shall be recognized by btrfs_scan_kernel() */ - if (!realpath(search, path)) { - fprintf(stderr, "ERROR: Could not show %s: %s\n", - search, strerror(errno)); - return 1; - } - - search = path; + if (realpath(search, path)) + search = path; /* * Needs special handling if input arg is block dev And if |