From patchwork Wed Jul 17 16:03:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2828820 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 B7D06C0AB2 for ; Wed, 17 Jul 2013 16:03:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 824E02035D for ; Wed, 17 Jul 2013 16:03:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A121D20221 for ; Wed, 17 Jul 2013 16:03:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755383Ab3GQQDs (ORCPT ); Wed, 17 Jul 2013 12:03:48 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:32869 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754452Ab3GQQDr (ORCPT ); Wed, 17 Jul 2013 12:03:47 -0400 Received: by mail-pb0-f42.google.com with SMTP id un1so2075908pbc.1 for ; Wed, 17 Jul 2013 09:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=7gUccMcJSiw7BGc4G0AfKf+wvUMnSfVEgYHTgHFMdkM=; b=rf8uYgsH/KDgCofHr1YBkoGf6iAfEWoWmnZ1vN5UX70NoBzySi4NnS9P1L+TrEtEGw 8JY3Gn5FdUO3t0ln5KjirS1qooha4bsrNK+os+nex11B2z+TuR6XhzMPXjMAFVai3Ap1 5BTQvYE7EHR5kgb2sYxlOtNR4i/91xvvCr+2RJnaFhL1Fy/nvPHqNAvpjClTyd3vMyzH P6ZkS8QTl+A+/CsdmcWIVZrn/PI5ia3Y12wzfP8SX84ZO+J7W6ibjYJlSU0jHGkd9GKM aulfqAsKlCWkU721C20sRLR4J1DjKeQB26reEc6NTSoRfO3lTTRBzYBC2+EE//eVHExn wmMw== X-Received: by 10.66.138.15 with SMTP id qm15mr8473643pab.128.1374077026919; Wed, 17 Jul 2013 09:03:46 -0700 (PDT) Received: from localhost.localdomain.localdomain ([223.65.142.204]) by mx.google.com with ESMTPSA id we2sm11323591pab.0.2013.07.17.09.03.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Jul 2013 09:03:45 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: wangsl.fnst@cn.fujitsu.com Subject: [PATCH] Btrfs-progs: fix wrong arg sb_bytenr for btrfs_scan_fs_devices() Date: Thu, 18 Jul 2013 00:03:40 +0800 Message-Id: <1374077020-21354-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.11.7 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.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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: Wang Shilong For most time, In open_ctree_*(), we use the first superblock (BTRFS_SUPER_INFO_OFFSET). However, for btrfs-convert, we don't, we should pass the correct sb_bytenr to btrfs_scan_fs_devices() rather than always use BTRFS_SUPER_INFO_OFFSET.This patch fix the following regression: mkfs.ext2 btrfs-convert warning, device 1 is missing Check tree block failed, want=2670592, have=0 read block failed check_tree_block Couldn't read chunk root Segmentation fault (core dumped) Signed-off-by: Wang Shilong --- btrfs-find-root.c | 2 +- cmds-chunk.c | 2 +- disk-io.c | 9 ++++++--- disk-io.h | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 9b3d7df..374cf81 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -82,7 +82,7 @@ static struct btrfs_root *open_ctree_broken(int fd, const char *device) return NULL; } - ret = btrfs_scan_fs_devices(fd, device, &fs_devices); + ret = btrfs_scan_fs_devices(fd, device, &fs_devices, 0); if (ret) goto out; diff --git a/cmds-chunk.c b/cmds-chunk.c index 03314de..6ada328 100644 --- a/cmds-chunk.c +++ b/cmds-chunk.c @@ -1291,7 +1291,7 @@ static int recover_prepare(struct recover_control *rc, char *path) goto fail_free_sb; } - ret = btrfs_scan_fs_devices(fd, path, &fs_devices); + ret = btrfs_scan_fs_devices(fd, path, &fs_devices, 0); if (ret) goto fail_free_sb; diff --git a/disk-io.c b/disk-io.c index 13dbe27..f8e236c 100644 --- a/disk-io.c +++ b/disk-io.c @@ -909,13 +909,16 @@ void btrfs_cleanup_all_caches(struct btrfs_fs_info *fs_info) } int btrfs_scan_fs_devices(int fd, const char *path, - struct btrfs_fs_devices **fs_devices) + struct btrfs_fs_devices **fs_devices, + u64 sb_bytenr) { u64 total_devs; int ret; + if (!sb_bytenr) + sb_bytenr = BTRFS_SUPER_INFO_OFFSET; ret = btrfs_scan_one_device(fd, path, fs_devices, - &total_devs, BTRFS_SUPER_INFO_OFFSET); + &total_devs, sb_bytenr); if (ret) { fprintf(stderr, "No valid Btrfs found on %s\n", path); return ret; @@ -1001,7 +1004,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path, if (restore) fs_info->on_restoring = 1; - ret = btrfs_scan_fs_devices(fp, path, &fs_devices); + ret = btrfs_scan_fs_devices(fp, path, &fs_devices, sb_bytenr); if (ret) goto out; diff --git a/disk-io.h b/disk-io.h index effaa9f..bc749c3 100644 --- a/disk-io.h +++ b/disk-io.h @@ -59,7 +59,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, void btrfs_release_all_roots(struct btrfs_fs_info *fs_info); void btrfs_cleanup_all_caches(struct btrfs_fs_info *fs_info); int btrfs_scan_fs_devices(int fd, const char *path, - struct btrfs_fs_devices **fs_devices); + struct btrfs_fs_devices **fs_devices, u64 sb_bytenr); int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info); struct btrfs_root *open_ctree(const char *filename, u64 sb_bytenr, int writes);