From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C58BAC072B1 for ; Tue, 28 May 2019 03:20:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A550B20717 for ; Tue, 28 May 2019 03:20:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728004AbfE1DUh (ORCPT ); Mon, 27 May 2019 23:20:37 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:17171 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727342AbfE1DUh (ORCPT ); Mon, 27 May 2019 23:20:37 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id CD19AA2EA6348A357050; Tue, 28 May 2019 11:20:34 +0800 (CST) Received: from architecture4.huawei.com (10.140.130.215) by smtp.huawei.com (10.3.19.209) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 28 May 2019 11:20:24 +0800 From: Gao Xiang To: Chao Yu , Greg Kroah-Hartman , CC: LKML , , "Chao Yu" , Miao Xie , , Fang Wei , Gao Xiang Subject: [PATCH v3 2/2] staging: erofs: fix i_blocks calculation Date: Tue, 28 May 2019 11:19:43 +0800 Message-ID: <20190528031943.239665-2-gaoxiang25@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190528031943.239665-1-gaoxiang25@huawei.com> References: <20190528023147.94117-2-gaoxiang25@huawei.com> <20190528031943.239665-1-gaoxiang25@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.140.130.215] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For compressed files, i_blocks should not be calculated by using i_size. use i_u.compressed_blocks instead. In addition, i_blocks was miscalculated for non-compressed files previously, fix it as well. Signed-off-by: Gao Xiang --- change log v3: - wrap i.u.compressed_blocks with le32_to_cpu() as Chao pointed out; change log v2: - fix description in commit message; - fix to 'inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK'. Thanks, Gao Xiang drivers/staging/erofs/inode.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/staging/erofs/inode.c b/drivers/staging/erofs/inode.c index 1c220900e1a0..9520419f746c 100644 --- a/drivers/staging/erofs/inode.c +++ b/drivers/staging/erofs/inode.c @@ -20,6 +20,7 @@ static int read_inode(struct inode *inode, void *data) struct erofs_vnode *vi = EROFS_V(inode); struct erofs_inode_v1 *v1 = data; const unsigned int advise = le16_to_cpu(v1->i_advise); + erofs_blk_t nblks = 0; vi->data_mapping_mode = __inode_data_mapping(advise); @@ -60,6 +61,10 @@ static int read_inode(struct inode *inode, void *data) le32_to_cpu(v2->i_ctime_nsec); inode->i_size = le64_to_cpu(v2->i_size); + + /* total blocks for compressed files */ + if (vi->data_mapping_mode == EROFS_INODE_LAYOUT_COMPRESSION) + nblks = le32_to_cpu(v2->i_u.compressed_blocks); } else if (__inode_version(advise) == EROFS_INODE_LAYOUT_V1) { struct erofs_sb_info *sbi = EROFS_SB(inode->i_sb); @@ -90,6 +95,8 @@ static int read_inode(struct inode *inode, void *data) sbi->build_time_nsec; inode->i_size = le32_to_cpu(v1->i_size); + if (vi->data_mapping_mode == EROFS_INODE_LAYOUT_COMPRESSION) + nblks = le32_to_cpu(v1->i_u.compressed_blocks); } else { errln("unsupported on-disk inode version %u of nid %llu", __inode_version(advise), vi->nid); @@ -97,8 +104,11 @@ static int read_inode(struct inode *inode, void *data) return -EIO; } - /* measure inode.i_blocks as the generic filesystem */ - inode->i_blocks = ((inode->i_size - 1) >> 9) + 1; + if (!nblks) + /* measure inode.i_blocks as generic filesystems */ + inode->i_blocks = roundup(inode->i_size, EROFS_BLKSIZ) >> 9; + else + inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK; return 0; } -- 2.17.1