From patchwork Thu May 18 03:38:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9732417 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 2F7136020B for ; Thu, 18 May 2017 03:39:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 104AD28797 for ; Thu, 18 May 2017 03:39:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0339328800; Thu, 18 May 2017 03:39:31 +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 B1E0328797 for ; Thu, 18 May 2017 03:39:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932211AbdERDj3 (ORCPT ); Wed, 17 May 2017 23:39:29 -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 S932198AbdERDjZ (ORCPT ); Wed, 17 May 2017 23:39:25 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18996769" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 18 May 2017 11:39:16 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 666BB47C6105; Thu, 18 May 2017 11:39:11 +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:10 +0800 From: Qu Wenruo To: , Subject: [PATCH 19/32] btrfs-progs: Refactor sectorsize users in mkfs/main.c Date: Thu, 18 May 2017 11:38:44 +0800 Message-ID: <20170518033857.15002-20-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: 666BB47C6105.ADE73 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 Signed-off-by: Qu Wenruo --- mkfs/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkfs/main.c b/mkfs/main.c index 61f746b3..24a51cb4 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -451,7 +451,7 @@ static int fill_inode_item(struct btrfs_trans_handle *trans, struct btrfs_inode_item *dst, struct stat *src) { u64 blocks = 0; - u64 sectorsize = root->sectorsize; + u64 sectorsize = root->fs_info->sectorsize; /* * btrfs_inode_item has some reserved fields @@ -652,7 +652,7 @@ static int add_file_items(struct btrfs_trans_handle *trans, u64 bytes_read = 0; struct btrfs_key key; int blocks; - u32 sectorsize = root->sectorsize; + u32 sectorsize = root->fs_info->sectorsize; u64 first_block = 0; u64 file_pos = 0; u64 cur_bytes;