From patchwork Fri Aug 30 11:09:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 2851889 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2A3A89F664 for ; Fri, 30 Aug 2013 11:02:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 098D6202BA for ; Fri, 30 Aug 2013 11:02:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A65B20250 for ; Fri, 30 Aug 2013 11:02:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466Ab3H3LCZ (ORCPT ); Fri, 30 Aug 2013 07:02:25 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:32767 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751897Ab3H3LCZ (ORCPT ); Fri, 30 Aug 2013 07:02:25 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r7UB2N0L012037 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 30 Aug 2013 11:02:24 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r7UB2MeJ017937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 30 Aug 2013 11:02:23 GMT Received: from abhmt119.oracle.com (abhmt119.oracle.com [141.146.116.71]) by userz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r7UB2MBS016196 for ; Fri, 30 Aug 2013 11:02:22 GMT Received: from wish.sg.oracle.com (/10.186.101.18) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 30 Aug 2013 04:02:22 -0700 From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs-progs: device add should check existing FS before adding Date: Fri, 30 Aug 2013 19:09:01 +0800 Message-Id: <1377860941-5741-1-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 1.8.1.164.g2d0029e X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 as of now, when 'btrfs device add' adds a device it doesn't check if the given device contains an existing FS. This patch will change that to check the same. which when true add will fail, and ask user to use -f option to overwrite. further, since now we have test_dev_for_mkfs() function to check if a disk can be used, so this patch will also use this function to test the given device before adding. Signed-off-by: Anand Jain --- cmds-device.c | 44 ++++++++++++++++++-------------------------- 1 files changed, 18 insertions(+), 26 deletions(-) diff --git a/cmds-device.c b/cmds-device.c index 282590c..8446502 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -53,12 +53,25 @@ static const char * const cmd_add_dev_usage[] = { static int cmd_add_dev(int argc, char **argv) { char *mntpnt; - int i, fdmnt, ret=0, e; + int i = 1, fdmnt, ret = 0, e; DIR *dirstream = NULL; + int c, force = 0; + char estr[100]; if (check_argc_min(argc, 3)) usage(cmd_add_dev_usage); + while ((c = getopt(argc, argv, "f")) != -1) { + switch (c) { + case 'f': + force = 1; + i++; + break; + default: + usage(cmd_add_dev_usage); + } + } + mntpnt = argv[argc - 1]; fdmnt = open_file_or_dir(mntpnt, &dirstream); @@ -67,23 +80,15 @@ static int cmd_add_dev(int argc, char **argv) return 12; } - for (i = 1; i < argc - 1; i++ ){ + for (; i < argc - 1; i++) { struct btrfs_ioctl_vol_args ioctl_args; int devfd, res; u64 dev_block_count = 0; - struct stat st; int mixed = 0; - res = check_mounted(argv[i]); - if (res < 0) { - fprintf(stderr, "error checking %s mount status\n", - argv[i]); - ret++; - continue; - } - if (res == 1) { - fprintf(stderr, "%s is mounted\n", argv[i]); - ret++; + res = test_dev_for_mkfs(argv[i], force, estr); + if (res) { + fprintf(stderr, "%s", estr); continue; } @@ -93,19 +98,6 @@ static int cmd_add_dev(int argc, char **argv) ret++; continue; } - res = fstat(devfd, &st); - if (res) { - fprintf(stderr, "ERROR: Unable to stat '%s'\n", argv[i]); - close(devfd); - ret++; - continue; - } - if (!S_ISBLK(st.st_mode)) { - fprintf(stderr, "ERROR: '%s' is not a block device\n", argv[i]); - close(devfd); - ret++; - continue; - } res = btrfs_prepare_device(devfd, argv[i], 1, &dev_block_count, 0, &mixed, 0);