From patchwork Thu Sep 18 03:31:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gui Hecheng X-Patchwork-Id: 4928801 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 811B8BEEA5 for ; Thu, 18 Sep 2014 03:32:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 930702017D for ; Thu, 18 Sep 2014 03:32:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7AFE020166 for ; Thu, 18 Sep 2014 03:32:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757520AbaIRDck (ORCPT ); Wed, 17 Sep 2014 23:32:40 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:58245 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1757154AbaIRDcj (ORCPT ); Wed, 17 Sep 2014 23:32:39 -0400 X-IronPort-AV: E=Sophos;i="5.04,543,1406563200"; d="scan'208";a="36111491" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 18 Sep 2014 11:29:38 +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 s8I3WhVi010907; Thu, 18 Sep 2014 11:32:44 +0800 Received: from localhost.localdomain (10.167.226.111) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 18 Sep 2014 11:32:45 +0800 From: Gui Hecheng To: CC: , Anand Jain Subject: [PATCH 1/3] btrfs-progs: remove BTRFS_SCAN_PROC scan method Date: Thu, 18 Sep 2014 11:31:44 +0800 Message-ID: <1411011106-21945-1-git-send-email-guihc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 MIME-Version: 1.0 X-Originating-IP: [10.167.226.111] 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 From: Anand Jain The libblkid scan method which was introduced later, will also scan devices under /proc/partitions. So we don't have to do the explicit scan of the same. Remove the scan method BTRFS_SCAN_PROC. Signed-off-by: Anand Jain --- cmds-device.c | 5 ++--- cmds-filesystem.c | 10 +++++----- disk-io.c | 2 +- utils.c | 5 +---- utils.h | 5 ++--- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/cmds-device.c b/cmds-device.c index a7183e3..a728f21 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -200,13 +200,13 @@ static int cmd_rm_dev(int argc, char **argv) static const char * const cmd_scan_dev_usage[] = { "btrfs device scan [(-d|--all-devices)| [...]]", "Scan devices for a btrfs filesystem", + " -d|--all-devices (deprecated)", NULL }; static int cmd_scan_dev(int argc, char **argv) { int i, fd, e; - int where = BTRFS_SCAN_LBLKID; int devstart = 1; int all = 0; int ret = 0; @@ -224,7 +224,6 @@ static int cmd_scan_dev(int argc, char **argv) break; switch (c) { case 'd': - where = BTRFS_SCAN_PROC; all = 1; break; default: @@ -237,7 +236,7 @@ static int cmd_scan_dev(int argc, char **argv) if (all || argc == 1) { printf("Scanning for Btrfs filesystems\n"); - ret = scan_for_btrfs(where, BTRFS_UPDATE_KERNEL); + ret = btrfs_scan_lblkid(BTRFS_UPDATE_KERNEL); if (ret) fprintf(stderr, "ERROR: error %d while scanning\n", ret); goto out; diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 69c1ca5..dc5185e 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -505,7 +505,7 @@ static int cmd_show(int argc, char **argv) struct list_head *cur_uuid; char *search = NULL; int ret; - int where = BTRFS_SCAN_LBLKID; + int where = -1; // default, search both kernel and udev int type = 0; char mp[BTRFS_PATH_NAME_MAX + 1]; char path[PATH_MAX]; @@ -526,7 +526,7 @@ static int cmd_show(int argc, char **argv) break; switch (c) { case 'd': - where = BTRFS_SCAN_PROC; + where = BTRFS_SCAN_LBLKID; break; case 'm': where = BTRFS_SCAN_MOUNTED; @@ -550,7 +550,7 @@ static int cmd_show(int argc, char **argv) * right away */ if (type == BTRFS_ARG_BLKDEV) { - if (where == BTRFS_SCAN_PROC) { + if (where == BTRFS_SCAN_LBLKID) { /* we need to do this because * legacy BTRFS_SCAN_DEV * provides /dev/dm-x paths @@ -586,7 +586,7 @@ static int cmd_show(int argc, char **argv) } } - if (where == BTRFS_SCAN_PROC) + if (where == BTRFS_SCAN_LBLKID) goto devs_only; /* show mounted btrfs */ @@ -601,7 +601,7 @@ static int cmd_show(int argc, char **argv) goto out; devs_only: - ret = scan_for_btrfs(where, !BTRFS_UPDATE_KERNEL); + ret = btrfs_scan_lblkid(!BTRFS_UPDATE_KERNEL); if (ret) { fprintf(stderr, "ERROR: %d while scanning\n", ret); diff --git a/disk-io.c b/disk-io.c index c7901f4..9fe8769 100644 --- a/disk-io.c +++ b/disk-io.c @@ -1005,7 +1005,7 @@ int btrfs_scan_fs_devices(int fd, const char *path, } if (total_devs != 1) { - ret = scan_for_btrfs(BTRFS_SCAN_PROC, run_ioctl); + ret = btrfs_scan_lblkid(run_ioctl); if (ret) return ret; } diff --git a/utils.c b/utils.c index fb78dd6..0ae0475 100644 --- a/utils.c +++ b/utils.c @@ -1150,7 +1150,7 @@ int check_mounted_where(int fd, const char *file, char *where, int size, /* scan other devices */ if (is_btrfs && total_devs > 1) { - if ((ret = scan_for_btrfs(BTRFS_SCAN_PROC, !BTRFS_UPDATE_KERNEL))) + if ((ret = btrfs_scan_lblkid(!BTRFS_UPDATE_KERNEL))) return ret; } @@ -2181,9 +2181,6 @@ int scan_for_btrfs(int where, int update_kernel) int ret = 0; switch (where) { - case BTRFS_SCAN_PROC: - ret = btrfs_scan_block_devices(update_kernel); - break; case BTRFS_SCAN_LBLKID: ret = btrfs_scan_lblkid(update_kernel); break; diff --git a/utils.h b/utils.h index 01b3259..13f2e60 100644 --- a/utils.h +++ b/utils.h @@ -26,9 +26,8 @@ #define BTRFS_MKFS_SYSTEM_GROUP_SIZE (4 * 1024 * 1024) #define BTRFS_MKFS_SMALL_VOLUME_SIZE (1024 * 1024 * 1024) -#define BTRFS_SCAN_PROC (1ULL << 0) -#define BTRFS_SCAN_MOUNTED (1ULL << 1) -#define BTRFS_SCAN_LBLKID (1ULL << 2) +#define BTRFS_SCAN_MOUNTED (1ULL << 0) +#define BTRFS_SCAN_LBLKID (1ULL << 1) #define BTRFS_UPDATE_KERNEL 1