From patchwork Thu May 18 03:38:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9732427 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4CED76020B for ; Thu, 18 May 2017 03:39:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DD4328800 for ; Thu, 18 May 2017 03:39:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 203F828802; Thu, 18 May 2017 03:39:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C399628800 for ; Thu, 18 May 2017 03:39:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932232AbdERDjj (ORCPT ); Wed, 17 May 2017 23:39:39 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:43366 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S932207AbdERDj2 (ORCPT ); Wed, 17 May 2017 23:39:28 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18996778" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 18 May 2017 11:39:22 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 56D2047C6528; Thu, 18 May 2017 11:39:18 +0800 (CST) Received: from localhost.localdomain (10.167.226.34) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 18 May 2017 11:39:17 +0800 From: Qu Wenruo To: , Subject: [PATCH 29/32] btrfs-progs: Remove block size members in btrfs_root Date: Thu, 18 May 2017 11:38:54 +0800 Message-ID: <20170518033857.15002-30-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170518033857.15002-1-quwenruo@cn.fujitsu.com> References: <20170518033857.15002-1-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.34] X-yoursite-MailScanner-ID: 56D2047C6528.AE951 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Finally, we can get rid of per tree block size members now. Signed-off-by: Qu Wenruo --- ctree.h | 9 --------- disk-io.c | 3 --- 2 files changed, 12 deletions(-) diff --git a/ctree.h b/ctree.h index 84298c7b..602c9562 100644 --- a/ctree.h +++ b/ctree.h @@ -1166,15 +1166,6 @@ struct btrfs_root { u64 objectid; u64 last_trans; - /* data allocations are done in sectorsize units */ - u32 sectorsize; - - /* node allocations are done in nodesize units */ - u32 nodesize; - - /* leaf allocations are done in nodesize units */ - u32 stripesize; - int ref_cows; int track_dirty; diff --git a/disk-io.c b/disk-io.c index 89e35c92..553073a4 100644 --- a/disk-io.c +++ b/disk-io.c @@ -481,9 +481,6 @@ void btrfs_setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info, { root->node = NULL; root->commit_root = NULL; - root->sectorsize = fs_info->sectorsize; - root->nodesize = fs_info->nodesize; - root->stripesize = fs_info->stripesize; root->ref_cows = 0; root->track_dirty = 0;