summaryrefslogtreecommitdiff
path: root/cmds-filesystem.c
diff options
context:
space:
mode:
authorGui Hecheng <guihc.fnst@cn.fujitsu.com>2014-11-13 09:36:20 +0800
committerDavid Sterba <dsterba@suse.cz>2014-11-14 11:02:33 +0100
commita1c3bcf1c294909801dbc23e77cac895dd14c41e (patch)
treed0766c1a8d3311f6b89943e2d3cad42f06a50a05 /cmds-filesystem.c
parent0c44c195fecad7db4bba064e6785faadf5c686b8 (diff)
btrfs-progs: use canonical name for device in btrfs fi show when mounted
When using lvm volumes to check fstests: btrfs/006, it fails like: Label: 'TestLabel.006' uuid: <UUID> Total devices <EXACTNUM> FS bytes used <SIZE> devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV + devid <DEVID> size <SIZE> used <SIZE> path /dev/dm-4 + devid <DEVID> size <SIZE> used <SIZE> path /dev/dm-5 + devid <DEVID> size <SIZE> used <SIZE> path /dev/dm-6 The /dev/dm-* points to lvm volumes, use @canonicalize_path() to convert them and we will make it through. Of course we should do the same thing for dev stat. Signed-off-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.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index e4b27859..cd6b3c69 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -510,7 +510,10 @@ static int print_one_fs(struct btrfs_ioctl_fs_info_args *fs_info,
pretty_size(calc_used_bytes(space_info)));
for (i = 0; i < fs_info->num_devices; i++) {
+ char *canonical_path;
+
tmp_dev_info = (struct btrfs_ioctl_dev_info_args *)&dev_info[i];
+ canonical_path = canonicalize_path((char *)tmp_dev_info->path);
/* Add check for missing devices even mounted */
fd = open((char *)tmp_dev_info->path, O_RDONLY);
@@ -523,7 +526,9 @@ static int print_one_fs(struct btrfs_ioctl_fs_info_args *fs_info,
tmp_dev_info->devid,
pretty_size(tmp_dev_info->total_bytes),
pretty_size(tmp_dev_info->bytes_used),
- tmp_dev_info->path);
+ canonical_path);
+
+ free(canonical_path);
}
if (missing)