From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752179AbeACJeA (ORCPT + 1 other); Wed, 3 Jan 2018 04:34:00 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:50185 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751830AbeACJd4 (ORCPT ); Wed, 3 Jan 2018 04:33:56 -0500 From: Chao Yu To: CC: , , , Chao Yu Subject: [PATCH 1/2] f2fs: use flexible array for f2fs_checkpoint::sit_nat_version_bitmap Date: Wed, 3 Jan 2018 17:32:50 +0800 Message-ID: <20180103093251.13597-1-yuchao0@huawei.com> X-Mailer: git-send-email 2.15.0.55.gc2ece9dc4de6 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.120.216.130] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: If we need an array with variable size in the end of structure, we can utilize flexible array feature which is supported in C99, so let's change sit_nat_version_bitmap[] to flexible array in struct f2fs_checkpoint for readability. Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 4 ++-- include/linux/f2fs_fs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 83d1f697388b..ad19d29688ae 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1719,13 +1719,13 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag) if (__cp_payload(sbi) > 0) { if (flag == NAT_BITMAP) - return &ckpt->sit_nat_version_bitmap; + return ckpt->sit_nat_version_bitmap; else return (unsigned char *)ckpt + F2FS_BLKSIZE; } else { offset = (flag == NAT_BITMAP) ? le32_to_cpu(ckpt->sit_ver_bitmap_bytesize) : 0; - return &ckpt->sit_nat_version_bitmap + offset; + return ckpt->sit_nat_version_bitmap + offset; } } diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h index 43e98d30d2df..564f65fc192f 100644 --- a/include/linux/f2fs_fs.h +++ b/include/linux/f2fs_fs.h @@ -157,7 +157,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; /* -- 2.15.0.55.gc2ece9dc4de6