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=-18.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 E6B8DC433DB for ; Wed, 24 Feb 2021 19:03:38 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 800F664F1A for ; Wed, 24 Feb 2021 19:03:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 800F664F1A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1lEzRh-00028U-9U; Wed, 24 Feb 2021 19:03:37 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEzRf-00028M-S0 for linux-f2fs-devel@lists.sourceforge.net; Wed, 24 Feb 2021 19:03:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version :Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=eigZdwtXsLboXw1wgkN0U9JLNu8sM+aRtcRXW6kKfk8=; b=EFHvoatRv1im0OsOizs0FQakiu 6zdE+WDjn5sBVQlnxh62mXrl2IUmK02IvEv0sNzFY3NheqAxjPoRjttjuF2JXCzNtdNftAs1rwnuS szL53QZSJLyHDZ31mfB6dKsiR19MGFm+mhL1Uft+/XDq/V5Xze+tXQJvtTCw1Zer/Qxg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Subject:Cc :To:From:Date:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=eigZdwtXsLboXw1wgkN0U9JLNu8sM+aRtcRXW6kKfk8=; b=A /p1W8TAKH2/c7IoGXm1RoW6F8Wa2E6QBIWIrTuLs//tXsXNSgxXLcJF6WyfGb+V/XmJVLOZ7JudqH XaOaxZ1JCQd44JWSZ0np9ZaddZILEeNJkGU/u2U0//SCGVRxABDARhk9nikYDBjrxd1uqh9pUmNbM Z5d4bSsUSZXIqEkc=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1lEzRX-0002Hz-W0 for linux-f2fs-devel@lists.sourceforge.net; Wed, 24 Feb 2021 19:03:35 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 527A164F16; Wed, 24 Feb 2021 19:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614193395; bh=PxDG3veJbNLyGyeroA2Pjfvxfc8wcJtTEAXzJyz6Q1U=; h=Date:From:To:Cc:Subject:From; b=kSL75zfidFWCa3nX4HBG5O0E4kB4mRGvnehoXEbkmf5DSSY1Mmy25DEzopyXCN1Y0 RR2JqUARIdspqhgdROz0cjWbp6tLBdX/8egll1JmtiM3mLDTSKm4TH/H/KUdqOXtWX dH2jxkvjHiFejfCatI1wTmCc9re12Vkr7ynGoCHj7VbUn1qRj6UsOXACJb+jkxxfZv TWpu8GSR1CSF7kGH3jdhC4+rwGKarf/PbvmjU1iQv37Oaj9l/BbyEo73R98XoTn0mD MzF67+fc4EpAYz5MMg3Q3pcAlP4raIFcIe+O9tvf/2MYbZKpi7EiMr7Y6dB93G+4Oi CHDlTB0rijKSQ== Date: Wed, 24 Feb 2021 13:03:13 -0600 From: "Gustavo A. R. Silva" To: Jaegeuk Kim , Chao Yu Message-ID: <20210224190313.GA144040@embeddedor> MIME-Version: 1.0 Content-Disposition: inline X-Headers-End: 1lEzRX-0002Hz-W0 Subject: [f2fs-dev] [PATCH][next] f2fs: Replace one-element array with flexible-array member X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net VGhlcmUgaXMgYSByZWd1bGFyIG5lZWQgaW4gdGhlIGtlcm5lbCB0byBwcm92aWRlIGEgd2F5IHRv IGRlY2xhcmUgaGF2aW5nCmEgZHluYW1pY2FsbHkgc2l6ZWQgc2V0IG9mIHRyYWlsaW5nIGVsZW1l bnRzIGluIGEgc3RydWN0dXJlLiBLZXJuZWwgY29kZQpzaG91bGQgYWx3YXlzIHVzZSDigJxmbGV4 aWJsZSBhcnJheSBtZW1iZXJz4oCdWzFdIGZvciB0aGVzZSBjYXNlcy4gVGhlIG9sZGVyCnN0eWxl IG9mIG9uZS1lbGVtZW50IG9yIHplcm8tbGVuZ3RoIGFycmF5cyBzaG91bGQgbm8gbG9uZ2VyIGJl IHVzZWRbMl0uCgpSZWZhY3RvciB0aGUgY29kZSBhY2NvcmRpbmcgdG8gdGhlIHVzZSBvZiBhIGZs ZXhpYmxlLWFycmF5IG1lbWJlciBpbgpzdHJ1Y3QgZjJmc19jaGVja3BvaW50LCBpbnN0ZWFkIG9m IGEgb25lLWVsZW1lbnQgYXJyYXlzLgoKTm90aWNlIHRoYXQgYSB0ZW1wb3JhcnkgcG9pbnRlciB0 byB2b2lkICcqdG1wX3B0cicgd2FzIHVzZWQgaW4gb3JkZXIgdG8KZml4IHRoZSBmb2xsb3dpbmcg ZXJyb3JzIHdoZW4gdXNpbmcgYSBmbGV4aWJsZSBhcnJheSBpbnN0ZWFkIG9mIGEgb25lCmVsZW1l bnQgYXJyYXkgaW4gc3RydWN0IGYyZnNfY2hlY2twb2ludDoKCiAgQ0MgW01dICBmcy9mMmZzL2Rp ci5vCkluIGZpbGUgaW5jbHVkZWQgZnJvbSBmcy9mMmZzL2Rpci5jOjEzOgpmcy9mMmZzL2YyZnMu aDogSW4gZnVuY3Rpb24g4oCYX19iaXRtYXBfcHRy4oCZOgpmcy9mMmZzL2YyZnMuaDoyMjI3OjQw OiBlcnJvcjogaW52YWxpZCB1c2Ugb2YgZmxleGlibGUgYXJyYXkgbWVtYmVyCiAyMjI3IHwgICBy ZXR1cm4gJmNrcHQtPnNpdF9uYXRfdmVyc2lvbl9iaXRtYXAgKyBvZmZzZXQgKyBzaXplb2YoX19s ZTMyKTsKICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBeCmZz L2YyZnMvZjJmcy5oOjIyMjc6NDk6IGVycm9yOiBpbnZhbGlkIHVzZSBvZiBmbGV4aWJsZSBhcnJh eSBtZW1iZXIKIDIyMjcgfCAgIHJldHVybiAmY2twdC0+c2l0X25hdF92ZXJzaW9uX2JpdG1hcCAr IG9mZnNldCArIHNpemVvZihfX2xlMzIpOwogICAgICB8ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIF4KZnMvZjJmcy9mMmZzLmg6MjIzODo0MDogZXJyb3I6 IGludmFsaWQgdXNlIG9mIGZsZXhpYmxlIGFycmF5IG1lbWJlcgogMjIzOCB8ICAgcmV0dXJuICZj a3B0LT5zaXRfbmF0X3ZlcnNpb25fYml0bWFwICsgb2Zmc2V0OwogICAgICB8ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIF4KbWFrZVsyXTogKioqIFtzY3JpcHRzL01ha2Vm aWxlLmJ1aWxkOjI4NzogZnMvZjJmcy9kaXIub10gRXJyb3IgMQptYWtlWzFdOiAqKiogW3Njcmlw dHMvTWFrZWZpbGUuYnVpbGQ6NTMwOiBmcy9mMmZzXSBFcnJvciAyCm1ha2U6ICoqKiBbTWFrZWZp bGU6MTgxOTogZnNdIEVycm9yIDIKClsxXSBodHRwczovL2VuLndpa2lwZWRpYS5vcmcvd2lraS9G bGV4aWJsZV9hcnJheV9tZW1iZXIKWzJdIGh0dHBzOi8vd3d3Lmtlcm5lbC5vcmcvZG9jL2h0bWwv djUuOS9wcm9jZXNzL2RlcHJlY2F0ZWQuaHRtbCN6ZXJvLWxlbmd0aC1hbmQtb25lLWVsZW1lbnQt YXJyYXlzCgpMaW5rOiBodHRwczovL2dpdGh1Yi5jb20vS1NQUC9saW51eC9pc3N1ZXMvNzkKQnVp bGQtdGVzdGVkLWJ5OiBrZXJuZWwgdGVzdCByb2JvdCA8bGtwQGludGVsLmNvbT4KTGluazogaHR0 cHM6Ly9sb3JlLmtlcm5lbC5vcmcvbGttbC82MDM2NDdlNC5EZUVGYmw0ZXFsanV3QVVlJTI1bGtw QGludGVsLmNvbS8KU2lnbmVkLW9mZi1ieTogR3VzdGF2byBBLiBSLiBTaWx2YSA8Z3VzdGF2b2Fy c0BrZXJuZWwub3JnPgotLS0KIGZzL2YyZnMvZjJmcy5oICAgICAgICAgIHwgNSArKystLQogaW5j bHVkZS9saW51eC9mMmZzX2ZzLmggfCAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9u cygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9mcy9mMmZzL2YyZnMuaCBiL2ZzL2Yy ZnMvZjJmcy5oCmluZGV4IGUyZDMwMmFlM2E0Ni4uM2Y1Y2IwOTdjMzBmIDEwMDY0NAotLS0gYS9m cy9mMmZzL2YyZnMuaAorKysgYi9mcy9mMmZzL2YyZnMuaApAQCAtMjIxNSw2ICsyMjE1LDcgQEAg c3RhdGljIGlubGluZSBibG9ja190IF9fY3BfcGF5bG9hZChzdHJ1Y3QgZjJmc19zYl9pbmZvICpz YmkpCiBzdGF0aWMgaW5saW5lIHZvaWQgKl9fYml0bWFwX3B0cihzdHJ1Y3QgZjJmc19zYl9pbmZv ICpzYmksIGludCBmbGFnKQogewogCXN0cnVjdCBmMmZzX2NoZWNrcG9pbnQgKmNrcHQgPSBGMkZT X0NLUFQoc2JpKTsKKwl2b2lkICp0bXBfcHRyID0gJmNrcHQtPnNpdF9uYXRfdmVyc2lvbl9iaXRt YXA7CiAJaW50IG9mZnNldDsKIAogCWlmIChpc19zZXRfY2twdF9mbGFncyhzYmksIENQX0xBUkdF X05BVF9CSVRNQVBfRkxBRykpIHsKQEAgLTIyMjQsNyArMjIyNSw3IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCAqX19iaXRtYXBfcHRyKHN0cnVjdCBmMmZzX3NiX2luZm8gKnNiaSwgaW50IGZsYWcpCiAJ CSAqIGlmIGxhcmdlX25hdF9iaXRtYXAgZmVhdHVyZSBpcyBlbmFibGVkLCBsZWF2ZSBjaGVja3N1 bQogCQkgKiBwcm90ZWN0aW9uIGZvciBhbGwgbmF0L3NpdCBiaXRtYXBzLgogCQkgKi8KLQkJcmV0 dXJuICZja3B0LT5zaXRfbmF0X3ZlcnNpb25fYml0bWFwICsgb2Zmc2V0ICsgc2l6ZW9mKF9fbGUz Mik7CisJCXJldHVybiB0bXBfcHRyICsgb2Zmc2V0ICsgc2l6ZW9mKF9fbGUzMik7CiAJfQogCiAJ aWYgKF9fY3BfcGF5bG9hZChzYmkpID4gMCkgewpAQCAtMjIzNSw3ICsyMjM2LDcgQEAgc3RhdGlj IGlubGluZSB2b2lkICpfX2JpdG1hcF9wdHIoc3RydWN0IGYyZnNfc2JfaW5mbyAqc2JpLCBpbnQg ZmxhZykKIAl9IGVsc2UgewogCQlvZmZzZXQgPSAoZmxhZyA9PSBOQVRfQklUTUFQKSA/CiAJCQls ZTMyX3RvX2NwdShja3B0LT5zaXRfdmVyX2JpdG1hcF9ieXRlc2l6ZSkgOiAwOwotCQlyZXR1cm4g JmNrcHQtPnNpdF9uYXRfdmVyc2lvbl9iaXRtYXAgKyBvZmZzZXQ7CisJCXJldHVybiB0bXBfcHRy ICsgb2Zmc2V0OwogCX0KIH0KIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9mMmZzX2ZzLmgg Yi9pbmNsdWRlL2xpbnV4L2YyZnNfZnMuaAppbmRleCBjNmNjMGE1NjZlZjUuLjU0ODdhODA2MTdh MyAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9mMmZzX2ZzLmgKKysrIGIvaW5jbHVkZS9saW51 eC9mMmZzX2ZzLmgKQEAgLTE2OCw3ICsxNjgsNyBAQCBzdHJ1Y3QgZjJmc19jaGVja3BvaW50IHsK IAl1bnNpZ25lZCBjaGFyIGFsbG9jX3R5cGVbTUFYX0FDVElWRV9MT0dTXTsKIAogCS8qIFNJVCBh bmQgTkFUIHZlcnNpb24gYml0bWFwICovCi0JdW5zaWduZWQgY2hhciBzaXRfbmF0X3ZlcnNpb25f Yml0bWFwWzFdOworCXVuc2lnbmVkIGNoYXIgc2l0X25hdF92ZXJzaW9uX2JpdG1hcFtdOwogfSBf X3BhY2tlZDsKIAogI2RlZmluZSBDUF9DSEtTVU1fT0ZGU0VUCTQwOTIJLyogZGVmYXVsdCBjaGtz dW0gb2Zmc2V0IGluIGNoZWNrcG9pbnQgKi8KLS0gCjIuMjcuMAoKCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eC1mMmZzLWRldmVsIG1haWxpbmcg bGlzdApMaW51eC1mMmZzLWRldmVsQGxpc3RzLnNvdXJjZWZvcmdlLm5ldApodHRwczovL2xpc3Rz LnNvdXJjZWZvcmdlLm5ldC9saXN0cy9saXN0aW5mby9saW51eC1mMmZzLWRldmVsCg== 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=-21.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 F17F1C433E6 for ; Wed, 24 Feb 2021 19:10:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF74660202 for ; Wed, 24 Feb 2021 19:10:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235977AbhBXTKT (ORCPT ); Wed, 24 Feb 2021 14:10:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:40260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235985AbhBXTJU (ORCPT ); Wed, 24 Feb 2021 14:09:20 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 527A164F16; Wed, 24 Feb 2021 19:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614193395; bh=PxDG3veJbNLyGyeroA2Pjfvxfc8wcJtTEAXzJyz6Q1U=; h=Date:From:To:Cc:Subject:From; b=kSL75zfidFWCa3nX4HBG5O0E4kB4mRGvnehoXEbkmf5DSSY1Mmy25DEzopyXCN1Y0 RR2JqUARIdspqhgdROz0cjWbp6tLBdX/8egll1JmtiM3mLDTSKm4TH/H/KUdqOXtWX dH2jxkvjHiFejfCatI1wTmCc9re12Vkr7ynGoCHj7VbUn1qRj6UsOXACJb+jkxxfZv TWpu8GSR1CSF7kGH3jdhC4+rwGKarf/PbvmjU1iQv37Oaj9l/BbyEo73R98XoTn0mD MzF67+fc4EpAYz5MMg3Q3pcAlP4raIFcIe+O9tvf/2MYbZKpi7EiMr7Y6dB93G+4Oi CHDlTB0rijKSQ== Date: Wed, 24 Feb 2021 13:03:13 -0600 From: "Gustavo A. R. Silva" To: Jaegeuk Kim , Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH][next] f2fs: Replace one-element array with flexible-array member Message-ID: <20210224190313.GA144040@embeddedor> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use “flexible array members”[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2]. Refactor the code according to the use of a flexible-array member in struct f2fs_checkpoint, instead of a one-element arrays. Notice that a temporary pointer to void '*tmp_ptr' was used in order to fix the following errors when using a flexible array instead of a one element array in struct f2fs_checkpoint: CC [M] fs/f2fs/dir.o In file included from fs/f2fs/dir.c:13: fs/f2fs/f2fs.h: In function ‘__bitmap_ptr’: fs/f2fs/f2fs.h:2227:40: error: invalid use of flexible array member 2227 | return &ckpt->sit_nat_version_bitmap + offset + sizeof(__le32); | ^ fs/f2fs/f2fs.h:2227:49: error: invalid use of flexible array member 2227 | return &ckpt->sit_nat_version_bitmap + offset + sizeof(__le32); | ^ fs/f2fs/f2fs.h:2238:40: error: invalid use of flexible array member 2238 | return &ckpt->sit_nat_version_bitmap + offset; | ^ make[2]: *** [scripts/Makefile.build:287: fs/f2fs/dir.o] Error 1 make[1]: *** [scripts/Makefile.build:530: fs/f2fs] Error 2 make: *** [Makefile:1819: fs] Error 2 [1] https://en.wikipedia.org/wiki/Flexible_array_member [2] https://www.kernel.org/doc/html/v5.9/process/deprecated.html#zero-length-and-one-element-arrays Link: https://github.com/KSPP/linux/issues/79 Build-tested-by: kernel test robot Link: https://lore.kernel.org/lkml/603647e4.DeEFbl4eqljuwAUe%25lkp@intel.com/ Signed-off-by: Gustavo A. R. Silva --- fs/f2fs/f2fs.h | 5 +++-- include/linux/f2fs_fs.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index e2d302ae3a46..3f5cb097c30f 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2215,6 +2215,7 @@ static inline block_t __cp_payload(struct f2fs_sb_info *sbi) static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag) { struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); + void *tmp_ptr = &ckpt->sit_nat_version_bitmap; int offset; if (is_set_ckpt_flags(sbi, CP_LARGE_NAT_BITMAP_FLAG)) { @@ -2224,7 +2225,7 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag) * if large_nat_bitmap feature is enabled, leave checksum * protection for all nat/sit bitmaps. */ - return &ckpt->sit_nat_version_bitmap + offset + sizeof(__le32); + return tmp_ptr + offset + sizeof(__le32); } if (__cp_payload(sbi) > 0) { @@ -2235,7 +2236,7 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag) } else { offset = (flag == NAT_BITMAP) ? le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; - return &ckpt->sit_nat_version_bitmap + offset; + return tmp_ptr + offset; } } diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h index c6cc0a566ef5..5487a80617a3 100644 --- a/include/linux/f2fs_fs.h +++ b/include/linux/f2fs_fs.h @@ -168,7 +168,7 @@ struct f2fs_checkpoint { unsigned char alloc_type[MAX_ACTIVE_LOGS]; /* SIT and NAT version bitmap */ - unsigned char sit_nat_version_bitmap[1]; + unsigned char sit_nat_version_bitmap[]; } __packed; #define CP_CHKSUM_OFFSET 4092 /* default chksum offset in checkpoint */ -- 2.27.0