From patchwork Thu Jul 10 03:05:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 4520581 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1CA40BEEAA for ; Thu, 10 Jul 2014 03:05:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5109020353 for ; Thu, 10 Jul 2014 03:05:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBC3920351 for ; Thu, 10 Jul 2014 03:05:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932066AbaGJDFf (ORCPT ); Wed, 9 Jul 2014 23:05:35 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:38118 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755481AbaGJDFS (ORCPT ); Wed, 9 Jul 2014 23:05:18 -0400 X-IronPort-AV: E=Sophos;i="5.00,867,1396972800"; d="scan'208";a="33078139" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Jul 2014 11:02:33 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s6A35FQm026114 for ; Thu, 10 Jul 2014 11:05:15 +0800 Received: from adam-work.lan (10.167.226.24) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 10 Jul 2014 11:05:16 +0800 From: Qu Wenruo To: Subject: [PATCH v2 RESEND 4/4] btrfs-progs: Add mount point output for 'btrfs fi df' Date: Thu, 10 Jul 2014 11:05:13 +0800 Message-ID: <1404961513-14614-4-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1404961513-14614-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1404961513-14614-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.24] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- v2: Call realpath() before find_mount_root() to deal with relative path --- cmds-filesystem.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 0a9b62a..d76a1a5 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -187,12 +187,28 @@ 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); + return 1; + } + printf("Mounted on: %s\n", mount_point); + free(real_path); + free(mount_point); fd = open_file_or_dir(path, &dirstream); if (fd < 0) {