From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Cc: <dsterba@suse.cz>
Subject: [PATCH v2] btrfs-progs: Add mount point output for 'btrfs fi df' command.
Date: Wed, 9 Jul 2014 14:56:57 +0800 [thread overview]
Message-ID: <1404889017-31426-1-git-send-email-quwenruo@cn.fujitsu.com> (raw)
Add mount point output for 'btrfs fi df'.
Also since the patch uses find_mount_root() to find mount point,
now 'btrfs fi df' can output more meaningful error message when given a
non-btrfs path.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
v2:
Call realpath() before find_mount_root() to deal with relative path
---
cmds-filesystem.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 4b2d27e..77e1db0 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -187,12 +187,31 @@ static int cmd_filesystem_df(int argc, char **argv)
int ret;
int fd;
char *path;
+ char *real_path = NULL;
+ char *mount_point = NULL;
DIR *dirstream = NULL;
if (check_argc_exact(argc, 2))
usage(cmd_filesystem_df_usage);
path = argv[1];
+ real_path = realpath(path, NULL);
+ if (!real_path) {
+ fprintf(stderr, "ERROR: Failed to resolve real path for %s: %s\n",
+ path, strerror(errno));
+ return 1;
+ }
+ ret = find_mount_root(real_path, &mount_point);
+ if (ret < 0) {
+ free(real_path);
+ if (ret != -ENOENT)
+ fprintf(stderr, "ERROR: Failed to find mount root for path %s: %s\n",
+ path, strerror(-ret));
+ return 1;
+ }
+ free(real_path);
+ printf("Mounted on: %s\n", mount_point);
+ free(mount_point);
fd = open_file_or_dir(path, &dirstream);
if (fd < 0) {
--
2.0.1
next reply other threads:[~2014-07-09 6:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-09 6:56 Qu Wenruo [this message]
2014-07-22 17:56 ` [PATCH v2] btrfs-progs: Add mount point output for 'btrfs fi df' command David Sterba
2014-07-23 1:26 ` Qu Wenruo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1404889017-31426-1-git-send-email-quwenruo@cn.fujitsu.com \
--to=quwenruo@cn.fujitsu.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).