From patchwork Thu Sep 18 03:31:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gui Hecheng X-Patchwork-Id: 4928811 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 4E9F7BEEA6 for ; Thu, 18 Sep 2014 03:32:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 77B85201BC for ; Thu, 18 Sep 2014 03:32:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93555201B9 for ; Thu, 18 Sep 2014 03:32:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757524AbaIRDcm (ORCPT ); Wed, 17 Sep 2014 23:32:42 -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 S1757513AbaIRDck (ORCPT ); Wed, 17 Sep 2014 23:32:40 -0400 X-IronPort-AV: E=Sophos;i="5.04,543,1406563200"; d="scan'208";a="36111492" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 18 Sep 2014 11:29:39 +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 s8I3Wj7D010910; Thu, 18 Sep 2014 11:32:45 +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:47 +0800 From: Gui Hecheng To: CC: , Anand Jain Subject: [PATCH 2/3] btrfs-progs: remove scan_for_btrfs() Date: Thu, 18 Sep 2014 11:31:45 +0800 Message-ID: <1411011106-21945-2-git-send-email-guihc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1411011106-21945-1-git-send-email-guihc.fnst@cn.fujitsu.com> References: <1411011106-21945-1-git-send-email-guihc.fnst@cn.fujitsu.com> 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 With the changes as in the previous patch, now scan_for_btrfs() is an unused function. So delete it. Signed-off-by: Anand Jain --- utils.c | 15 --------------- utils.h | 1 - 2 files changed, 16 deletions(-) diff --git a/utils.c b/utils.c index 0ae0475..0cd97c7 100644 --- a/utils.c +++ b/utils.c @@ -2173,21 +2173,6 @@ int btrfs_scan_lblkid(int update_kernel) return 0; } -/* - * scans devs for the btrfs -*/ -int scan_for_btrfs(int where, int update_kernel) -{ - int ret = 0; - - switch (where) { - case BTRFS_SCAN_LBLKID: - ret = btrfs_scan_lblkid(update_kernel); - break; - } - return ret; -} - int is_vol_small(char *file) { int fd = -1; diff --git a/utils.h b/utils.h index 13f2e60..12466a6 100644 --- a/utils.h +++ b/utils.h @@ -105,7 +105,6 @@ u64 btrfs_device_size(int fd, struct stat *st); /* Helper to always get proper size of the destination string */ #define strncpy_null(dest, src) __strncpy__null(dest, src, sizeof(dest)) int test_dev_for_mkfs(char *file, int force_overwrite, char *estr); -int scan_for_btrfs(int where, int update_kernel); int get_label_mounted(const char *mount_path, char *labelp); int test_num_disk_vs_raid(u64 metadata_profile, u64 data_profile, u64 dev_cnt, int mixed, char *estr);