From patchwork Mon Oct 12 13:23:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaolei X-Patchwork-Id: 7375131 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 458A3BEEA4 for ; Mon, 12 Oct 2015 13:25:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3634B206BE for ; Mon, 12 Oct 2015 13:25:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 540A3206A4 for ; Mon, 12 Oct 2015 13:25:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752434AbbJLNZA (ORCPT ); Mon, 12 Oct 2015 09:25:00 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:19752 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752342AbbJLNYy (ORCPT ); Mon, 12 Oct 2015 09:24:54 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="101738563" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 12 Oct 2015 21:27:18 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t9CDONjx026216 for ; Mon, 12 Oct 2015 21:24:23 +0800 Received: from localhost.localdomain (10.167.226.114) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.181.6; Mon, 12 Oct 2015 21:24:49 +0800 From: Zhao Lei To: CC: Zhao Lei Subject: [PATCH 10/11] btrfs-progs: replace: use btrfs_open_dir for btrfs replace command Date: Mon, 12 Oct 2015 21:23:03 +0800 Message-ID: <4eb5c0f11f4eac93a66e38f114c72bf07ef49704.1444655800.git.zhaolei@cn.fujitsu.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 We can use btrfs_open_dir() to check whether target dir is in btrfs's mount point before open, instead of checking it in kernel space of ioctl, and return fuzzy error message. Before patch: # ./btrfs replace cancel /mnt/tmp1 ERROR: ioctl(DEV_REPLACE_CANCEL) failed on "/mnt/tmp1": Inappropriate ioctl for device # ./btrfs replace status /mnt/tmp1 ERROR: ioctl(DEV_REPLACE_STATUS) failed on "/mnt/tmp1": Inappropriate ioctl for device After patch: # ./btrfs replace cancel /mnt/tmp1 ERROR: not a btrfs filesystem: /mnt/tmp1 # ./btrfs replace status /mnt/tmp1 ERROR: not a btrfs filesystem: /mnt/tmp1 Signed-off-by: Zhao Lei --- cmds-replace.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/cmds-replace.c b/cmds-replace.c index 385b764..9596f2a 100644 --- a/cmds-replace.c +++ b/cmds-replace.c @@ -348,7 +348,6 @@ static const char *const cmd_replace_status_usage[] = { static int cmd_replace_status(int argc, char **argv) { int fd; - int e; int c; char *path; int once = 0; @@ -370,13 +369,9 @@ static int cmd_replace_status(int argc, char **argv) usage(cmd_replace_status_usage); path = argv[optind]; - fd = open_file_or_dir(path, &dirstream); - e = errno; - if (fd < 0) { - fprintf(stderr, "ERROR: can't access \"%s\": %s\n", - path, strerror(e)); + fd = btrfs_open_dir(path, &dirstream, 1); + if (fd < 0) return 1; - } ret = print_replace_status(fd, path, once); close_file_or_dir(fd, dirstream); @@ -541,12 +536,9 @@ static int cmd_replace_cancel(int argc, char **argv) usage(cmd_replace_cancel_usage); path = argv[optind]; - fd = open_file_or_dir(path, &dirstream); - if (fd < 0) { - fprintf(stderr, "ERROR: can't access \"%s\": %s\n", - path, strerror(errno)); + fd = btrfs_open_dir(path, &dirstream, 1); + if (fd < 0) return 1; - } args.cmd = BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL; args.result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT;