From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp1040.oracle.com ([156.151.31.81]:44381 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756228Ab3GYRaN (ORCPT ); Thu, 25 Jul 2013 13:30:13 -0400 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r6PHUCaw030595 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 25 Jul 2013 17:30:13 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r6PHUBcg026804 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 25 Jul 2013 17:30:12 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r6PHUB8Y029142 for ; Thu, 25 Jul 2013 17:30:11 GMT From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/6] btrfs-progs: close_all_devices() in btrfs-find-root.c does nothing Date: Fri, 26 Jul 2013 01:35:25 +0800 Message-Id: <1374773730-29957-2-git-send-email-anand.jain@oracle.com> In-Reply-To: <1374773730-29957-1-git-send-email-anand.jain@oracle.com> References: <1374773730-29957-1-git-send-email-anand.jain@oracle.com> Sender: linux-btrfs-owner@vger.kernel.org List-ID: close_all_devices() is declared once in disk-io.c and again in btrfs-find-root.c. The one in latter is completely useless so delete it. This patch will fix it. Signed-off-by: Anand Jain --- btrfs-find-root.c | 17 +---------------- disk-io.c | 3 +-- disk-io.h | 1 + 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 253c200..82440f6 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -34,6 +34,7 @@ #include "volumes.h" #include "utils.h" #include "crc32c.h" +#include "disk-io.h" static u16 csum_size = 0; static u64 search_objectid = BTRFS_ROOT_TREE_OBJECTID; @@ -65,22 +66,6 @@ int csum_block(void *buf, u32 len) return ret; } -static int close_all_devices(struct btrfs_fs_info *fs_info) -{ - struct list_head *list; - struct list_head *next; - struct btrfs_device *device; - - return 0; - - list = &fs_info->fs_devices->devices; - list_for_each(next, list) { - device = list_entry(next, struct btrfs_device, dev_list); - close(device->fd); - } - return 0; -} - static struct btrfs_root *open_ctree_broken(int fd, const char *device) { u32 sectorsize; diff --git a/disk-io.c b/disk-io.c index 5b84b02..d23c4d9 100644 --- a/disk-io.c +++ b/disk-io.c @@ -35,7 +35,6 @@ #include "utils.h" #include "print-tree.h" -static int close_all_devices(struct btrfs_fs_info *fs_info); static int check_tree_block(struct btrfs_root *root, struct extent_buffer *buf) { @@ -1165,7 +1164,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans, return ret; } -static int close_all_devices(struct btrfs_fs_info *fs_info) +int close_all_devices(struct btrfs_fs_info *fs_info) { struct list_head *list; struct btrfs_device *device; diff --git a/disk-io.h b/disk-io.h index 0158d17..c25bc07 100644 --- a/disk-io.h +++ b/disk-io.h @@ -89,6 +89,7 @@ int csum_tree_block_size(struct extent_buffer *buf, u16 csum_sectorsize, int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf, int verify); int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid); +int close_all_devices(struct btrfs_fs_info *fs_info); #endif /* raid6.c */ -- 1.7.1