From patchwork Mon Oct 26 10:28:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaolei X-Patchwork-Id: 7486841 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 30C61BEEA4 for ; Mon, 26 Oct 2015 10:30:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51EEE207D4 for ; Mon, 26 Oct 2015 10:30:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 646272071C for ; Mon, 26 Oct 2015 10:30:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753895AbbJZKaI (ORCPT ); Mon, 26 Oct 2015 06:30:08 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:48063 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753865AbbJZKaF (ORCPT ); Mon, 26 Oct 2015 06:30:05 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="102287530" Received: from bogon (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Oct 2015 18:32: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 t9QATU9S004079 for ; Mon, 26 Oct 2015 18:29:30 +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, 26 Oct 2015 18:30:02 +0800 From: Zhao Lei To: CC: Zhao Lei Subject: [PATCH v2 2/5] btrfs-progs: Remove all btrfs_close_all_devices in sub-command Date: Mon, 26 Oct 2015 18:28:19 +0800 Message-ID: <100cdd79193c6a61f4e41493281be1d374bae4c0.1445855131.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, 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 Since we have btrfs_close_all_devices() in btrfs's main entrance, it is not necessary to call btrfs_close_all_devices() separately in each sub-command. Signed-off-by: Zhao Lei --- cmds-check.c | 1 - cmds-device.c | 3 --- cmds-replace.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/cmds-check.c b/cmds-check.c index 1f8caad..3af6e61 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -9738,7 +9738,6 @@ out: free_root_recs_tree(&root_cache); close_out: close_ctree(root); - btrfs_close_all_devices(); err_out: if (ctx.progress_enabled) task_deinit(ctx.info); diff --git a/cmds-device.c b/cmds-device.c index 5f2b952..620ae8b 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -139,7 +139,6 @@ static int cmd_device_add(int argc, char **argv) error_out: close_file_or_dir(fdmnt, dirstream); - btrfs_close_all_devices(); return !!ret; } @@ -288,7 +287,6 @@ static int cmd_device_scan(int argc, char **argv) } out: - btrfs_close_all_devices(); return !!ret; } @@ -466,7 +464,6 @@ static int cmd_device_stats(int argc, char **argv) out: free(di_args); close_file_or_dir(fdmnt, dirstream); - btrfs_close_all_devices(); return err; } diff --git a/cmds-replace.c b/cmds-replace.c index 9ab8438..fadd2cd 100644 --- a/cmds-replace.c +++ b/cmds-replace.c @@ -330,7 +330,6 @@ static int cmd_replace_start(int argc, char **argv) } } close_file_or_dir(fdmnt, dirstream); - btrfs_close_all_devices(); return 0; leave_with_error: @@ -340,7 +339,6 @@ leave_with_error: close(fdmnt); if (fddstdev != -1) close(fddstdev); - btrfs_close_all_devices(); return 1; }