| Message ID | 20230816011359.1964484-2-drosen@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add 16K Support for f2fs-tools | expand |
Hi Daniel,
f2fs_format_main.c: In function ‘add_default_options’:
f2fs_format_main.c:142:41: error: ‘struct f2fs_configuration’ has no member named ‘blksize’
142 | c.wanted_sector_size = c.blksize;
| ^
make[2]: *** [Makefile:516: f2fs_format_main.o] Error 1
make[2]: *** Waiting for unfinished jobs....
f2fs_format_main.c: In function 'add_default_options':
f2fs_format_main.c:142:41: error: 'struct f2fs_configuration' has no member named 'blksize'
142 | c.wanted_sector_size = c.blksize;
|
On 08/15, Daniel Rosenberg wrote:
> This converts the various block size based constants to be defined in
> terms of the block size. This makes it possible to change the block size
> by changing only F2FS_BLKSIZE_BITS in f2fs_fs.h
>
> Signed-off-by: Daniel Rosenberg <drosen@google.com>
> ---
> fsck/fsck.h | 2 +-
> fsck/mount.c | 4 +-
> include/f2fs_fs.h | 81 +++++++++++++++++++++++------------------
> mkfs/f2fs_format.c | 12 +++---
> mkfs/f2fs_format_main.c | 2 +-
> 5 files changed, 55 insertions(+), 46 deletions(-)
>
> diff --git a/fsck/fsck.h b/fsck/fsck.h
> index 0f7caf4..89d0b22 100644
> --- a/fsck/fsck.h
> +++ b/fsck/fsck.h
> @@ -126,7 +126,7 @@ struct f2fs_fsck {
> struct quota_ctx *qctx;
> };
>
> -#define BLOCK_SZ 4096
> +#define BLOCK_SZ F2FS_BLKSIZE
> struct block {
> unsigned char buf[BLOCK_SZ];
> };
> diff --git a/fsck/mount.c b/fsck/mount.c
> index 5e687a8..831a7a3 100644
> --- a/fsck/mount.c
> +++ b/fsck/mount.c
> @@ -995,8 +995,8 @@ int sanity_check_raw_super(struct f2fs_super_block *sb, enum SB_ADDR sb_addr)
>
> blocksize = 1 << get_sb(log_blocksize);
> if (F2FS_BLKSIZE != blocksize) {
> - MSG(0, "Invalid blocksize (%u), supports only 4KB\n",
> - blocksize);
> + MSG(0, "Invalid blocksize (%u), supports only (%u)\n",
> + blocksize, F2FS_BLKSIZE);
> return -1;
> }
>
> diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
> index 7e7db22..6975143 100644
> --- a/include/f2fs_fs.h
> +++ b/include/f2fs_fs.h
> @@ -385,18 +385,18 @@ static inline uint64_t bswap_64(uint64_t val)
> #define SECTOR_SHIFT 9
> #endif
> #define F2FS_SUPER_MAGIC 0xF2F52010 /* F2FS Magic Number */
> -#define CP_CHKSUM_OFFSET 4092
> +#define CP_CHKSUM_OFFSET (F2FS_BLKSIZE - sizeof(__le32))
> #define SB_CHKSUM_OFFSET 3068
> #define MAX_PATH_LEN 64
> #define MAX_DEVICES 8
>
> #define F2FS_BYTES_TO_BLK(bytes) ((bytes) >> F2FS_BLKSIZE_BITS)
> -#define F2FS_BLKSIZE_BITS 12
> +#define F2FS_BLKSIZE_BITS 12 /* 4KB block */
>
> /* for mkfs */
> #define F2FS_NUMBER_OF_CHECKPOINT_PACK 2
> #define DEFAULT_SECTOR_SIZE 512
> -#define DEFAULT_SECTORS_PER_BLOCK 8
> +#define DEFAULT_SECTORS_PER_BLOCK (1 << (F2FS_BLKSIZE_BITS - SECTOR_SHIFT))
> #define DEFAULT_BLOCKS_PER_SEGMENT 512
> #define DEFAULT_SEGMENTS_PER_SECTION 1
>
> @@ -627,8 +627,8 @@ enum {
> */
> #define F2FS_SUPER_OFFSET 1024 /* byte-size offset */
> #define F2FS_MIN_LOG_SECTOR_SIZE 9 /* 9 bits for 512 bytes */
> -#define F2FS_MAX_LOG_SECTOR_SIZE 12 /* 12 bits for 4096 bytes */
> -#define F2FS_BLKSIZE 4096 /* support only 4KB block */
> +#define F2FS_MAX_LOG_SECTOR_SIZE F2FS_BLKSIZE_BITS /* 12 bits for 4096 bytes */
> +#define F2FS_BLKSIZE (1 << F2FS_BLKSIZE_BITS)/* support only 4KB block */
> #define F2FS_MAX_EXTENSION 64 /* # of extension entries */
> #define F2FS_EXTENSION_LEN 8 /* max size of extension */
> #define F2FS_BLK_ALIGN(x) (((x) + F2FS_BLKSIZE - 1) / F2FS_BLKSIZE)
> @@ -642,7 +642,7 @@ enum {
> #define F2FS_META_INO(sbi) (sbi->meta_ino_num)
>
> #define F2FS_MAX_QUOTAS 3
> -#define QUOTA_DATA 2
> +#define QUOTA_DATA (((1024 * 6 - 1) / F2FS_BLKSIZE) + 1)
> #define QUOTA_INO(sb,t) (le32_to_cpu((sb)->qf_ino[t]))
>
> /*
> @@ -853,7 +853,7 @@ static_assert(sizeof(struct f2fs_checkpoint) == 192, "");
> /*
> * For orphan inode management
> */
> -#define F2FS_ORPHANS_PER_BLOCK 1020
> +#define F2FS_ORPHANS_PER_BLOCK ((F2FS_BLKSIZE - 4 * sizeof(__le32)) / sizeof(__le32))
>
> struct f2fs_orphan_block {
> __le32 ino[F2FS_ORPHANS_PER_BLOCK]; /* inode numbers */
> @@ -864,7 +864,7 @@ struct f2fs_orphan_block {
> __le32 check_sum; /* CRC32 for orphan inode block */
> };
>
> -static_assert(sizeof(struct f2fs_orphan_block) == 4096, "");
> +static_assert(sizeof(struct f2fs_orphan_block) == F2FS_BLKSIZE, "");
>
> /*
> * For NODE structure
> @@ -884,13 +884,31 @@ static_assert(sizeof(struct f2fs_extent) == 12, "");
>
> /* 200 bytes for inline xattrs by default */
> #define DEFAULT_INLINE_XATTR_ADDRS 50
> -#define DEF_ADDRS_PER_INODE 923 /* Address Pointers in an Inode */
> +
> +struct node_footer {
> + __le32 nid; /* node id */
> + __le32 ino; /* inode number */
> + __le32 flag; /* include cold/fsync/dentry marks and offset */
> + __le64 cp_ver __attribute__((packed)); /* checkpoint version */
> + __le32 next_blkaddr; /* next node page block address */
> +};
> +
> +static_assert(sizeof(struct node_footer) == 24, "");
> +
> +#define OFFSET_OF_END_OF_I_EXT 360
> +#define SIZE_OF_I_NID 20
> +/* Address Pointers in an Inode */
> +#define DEF_ADDRS_PER_INODE ((F2FS_BLKSIZE - OFFSET_OF_END_OF_I_EXT \
> + - SIZE_OF_I_NID \
> + - sizeof(struct node_footer)) / sizeof(__le32))
> #define CUR_ADDRS_PER_INODE(inode) (DEF_ADDRS_PER_INODE - \
> __get_extra_isize(inode))
> #define ADDRS_PER_INODE(i) addrs_per_inode(i)
> -#define DEF_ADDRS_PER_BLOCK 1018 /* Address Pointers in a Direct Block */
> +/* Address Pointers in a Direct Block */
> +#define DEF_ADDRS_PER_BLOCK ((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32))
> #define ADDRS_PER_BLOCK(i) addrs_per_block(i)
> -#define NIDS_PER_BLOCK 1018 /* Node IDs in an Indirect Block */
> +/* Node IDs in an Indirect Block */
> +#define NIDS_PER_BLOCK ((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32))
>
> #define NODE_DIR1_BLOCK (DEF_ADDRS_PER_INODE + 1)
> #define NODE_DIR2_BLOCK (DEF_ADDRS_PER_INODE + 2)
> @@ -1024,19 +1042,19 @@ struct f2fs_inode {
>
> static_assert(offsetof(struct f2fs_inode, i_extra_end) -
> offsetof(struct f2fs_inode, i_extra_isize) == 36, "");
> -static_assert(sizeof(struct f2fs_inode) == 4072, "");
> +static_assert(sizeof(struct f2fs_inode) == F2FS_BLKSIZE - 24, "");
>
> struct direct_node {
> __le32 addr[DEF_ADDRS_PER_BLOCK]; /* array of data block address */
> };
>
> -static_assert(sizeof(struct direct_node) == 4072, "");
> +static_assert(sizeof(struct direct_node) == F2FS_BLKSIZE - 24, "");
>
> struct indirect_node {
> __le32 nid[NIDS_PER_BLOCK]; /* array of data block address */
> };
>
> -static_assert(sizeof(struct indirect_node) == 4072, "");
> +static_assert(sizeof(struct indirect_node) == F2FS_BLKSIZE - 24, "");
>
> enum {
> COLD_BIT_SHIFT = 0,
> @@ -1047,15 +1065,6 @@ enum {
>
> #define XATTR_NODE_OFFSET ((((unsigned int)-1) << OFFSET_BIT_SHIFT) \
> >> OFFSET_BIT_SHIFT)
> -struct node_footer {
> - __le32 nid; /* node id */
> - __le32 ino; /* inode nunmber */
> - __le32 flag; /* include cold/fsync/dentry marks and offset */
> - __le64 cp_ver __attribute__((packed)); /* checkpoint version */
> - __le32 next_blkaddr; /* next node page block address */
> -};
> -
> -static_assert(sizeof(struct node_footer) == 24, "");
>
> struct f2fs_node {
> /* can be one of three types: inode, direct, and indirect types */
> @@ -1067,7 +1076,7 @@ struct f2fs_node {
> struct node_footer footer;
> };
>
> -static_assert(sizeof(struct f2fs_node) == 4096, "");
> +static_assert(sizeof(struct f2fs_node) == F2FS_BLKSIZE, "");
>
> /*
> * For NAT entries
> @@ -1089,7 +1098,7 @@ struct f2fs_nat_block {
> struct f2fs_nat_entry entries[NAT_ENTRY_PER_BLOCK];
> };
>
> -static_assert(sizeof(struct f2fs_nat_block) == 4095, "");
> +static_assert(sizeof(struct f2fs_nat_block) == F2FS_BLKSIZE - (F2FS_BLKSIZE % 9), "");
>
> /*
> * For SIT entries
> @@ -1140,13 +1149,13 @@ struct f2fs_sit_block {
> struct f2fs_sit_entry entries[SIT_ENTRY_PER_BLOCK];
> };
>
> -static_assert(sizeof(struct f2fs_sit_block) == 4070, "");
> +static_assert(sizeof(struct f2fs_sit_block) == F2FS_BLKSIZE - (F2FS_BLKSIZE % 74), "");
>
> /*
> * For segment summary
> *
> - * One summary block contains exactly 512 summary entries, which represents
> - * exactly 2MB segment by default. Not allow to change the basic units.
> + * One summary block contains exactly 2048 summary entries, which represents
> + * exactly 32MB segment by default. Not allow to change the basic units.
> *
> * NOTE: For initializing fields, you must use set_summary
> *
> @@ -1157,7 +1166,7 @@ static_assert(sizeof(struct f2fs_sit_block) == 4070, "");
> * from node's page's beginning to get a data block address.
> * ex) data_blkaddr = (block_t)(nodepage_start_address + ofs_in_node)
> */
> -#define ENTRIES_IN_SUM 512
> +#define ENTRIES_IN_SUM (F2FS_BLKSIZE / 8)
> #define SUMMARY_SIZE (7) /* sizeof(struct summary) */
> #define SUM_FOOTER_SIZE (5) /* sizeof(struct summary_footer) */
> #define SUM_ENTRIES_SIZE (SUMMARY_SIZE * ENTRIES_IN_SUM)
> @@ -1225,7 +1234,7 @@ struct nat_journal {
> __u8 reserved[NAT_JOURNAL_RESERVED];
> };
>
> -static_assert(sizeof(struct nat_journal) == 505, "");
> +static_assert(sizeof(struct nat_journal) == (F2FS_BLKSIZE / 8) - 7, "");
>
> struct sit_journal_entry {
> __le32 segno;
> @@ -1239,14 +1248,14 @@ struct sit_journal {
> __u8 reserved[SIT_JOURNAL_RESERVED];
> };
>
> -static_assert(sizeof(struct sit_journal) == 505, "");
> +static_assert(sizeof(struct sit_journal) == (F2FS_BLKSIZE / 8) - 7, "");
>
> struct f2fs_extra_info {
> __le64 kbytes_written;
> __u8 reserved[EXTRA_INFO_RESERVED];
> } __attribute__((packed));
>
> -static_assert(sizeof(struct f2fs_extra_info) == 505, "");
> +static_assert(sizeof(struct f2fs_extra_info) == (F2FS_BLKSIZE / 8) - 7, "");
>
> struct f2fs_journal {
> union {
> @@ -1261,7 +1270,7 @@ struct f2fs_journal {
> };
> } __attribute__((packed));
>
> -static_assert(sizeof(struct f2fs_journal) == 507, "");
> +static_assert(sizeof(struct f2fs_journal) == (F2FS_BLKSIZE / 8) - 5, "");
>
> /* 4KB-sized summary block structure */
> struct f2fs_summary_block {
> @@ -1270,7 +1279,7 @@ struct f2fs_summary_block {
> struct summary_footer footer;
> };
>
> -static_assert(sizeof(struct f2fs_summary_block) == 4096, "");
> +static_assert(sizeof(struct f2fs_summary_block) == F2FS_BLKSIZE, "");
>
> /*
> * For directory operations
> @@ -1289,8 +1298,8 @@ typedef __le32 f2fs_hash_t;
> #define GET_DENTRY_SLOTS(x) ((x + F2FS_SLOT_LEN - 1) >> F2FS_SLOT_LEN_BITS)
>
> /* the number of dentry in a block */
> -#define NR_DENTRY_IN_BLOCK 214
> -
> +#define NR_DENTRY_IN_BLOCK ((BITS_PER_BYTE * F2FS_BLKSIZE) / \
> + ((SIZE_OF_DIR_ENTRY + F2FS_SLOT_LEN) * BITS_PER_BYTE + 1))
> /* MAX level for dir lookup */
> #define MAX_DIR_HASH_DEPTH 63
>
> diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
> index 019fb3a..7ad9acf 100644
> --- a/mkfs/f2fs_format.c
> +++ b/mkfs/f2fs_format.c
> @@ -1372,7 +1372,7 @@ static int f2fs_write_default_quota(int qtype, __le32 raw_id)
>
> memcpy(filebuf + 5136, &dqblk, sizeof(struct v2r1_disk_dqblk));
>
> - /* Write two blocks */
> + /* Write quota blocks */
> for (i = 0; i < QUOTA_DATA; i++) {
> blkaddr = alloc_next_free_block(CURSEG_HOT_DATA);
>
> @@ -1385,13 +1385,13 @@ static int f2fs_write_default_quota(int qtype, __le32 raw_id)
> update_sit_journal(CURSEG_HOT_DATA);
> update_summary_entry(CURSEG_HOT_DATA,
> le32_to_cpu(sb->qf_ino[qtype]), i);
> - }
> + DBG(1, "\tWriting quota data, at offset %08x (%d/%d)\n",
> + blkaddr, i + 1, QUOTA_DATA);
>
> - DBG(1, "\tWriting quota data, at offset %08x, %08x\n",
> - blkaddr - 1, blkaddr);
> + }
>
> free(filebuf);
> - return blkaddr - 1;
> + return blkaddr + 1 - QUOTA_DATA;
> }
>
> static int f2fs_write_qf_inode(int qtype)
> @@ -1426,7 +1426,7 @@ static int f2fs_write_qf_inode(int qtype)
> else
> ASSERT(0);
>
> - /* write two blocks */
> + /* write quota blocks */
> data_blkaddr = f2fs_write_default_quota(qtype, raw_id);
> if (data_blkaddr == 0) {
> free(raw_node);
> diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c
> index d8c9cea..c0f4253 100644
> --- a/mkfs/f2fs_format_main.c
> +++ b/mkfs/f2fs_format_main.c
> @@ -141,7 +141,7 @@ static void add_default_options(void)
> /* -d1 -f -w 4096 -R 0:0 */
> c.dbg_lv = 1;
> force_overwrite = 1;
> - c.wanted_sector_size = 4096;
> + c.wanted_sector_size = c.blksize;
> c.root_uid = c.root_gid = 0;
>
> /* RO doesn't need any other features */
> --
> 2.41.0.694.ge786442a9b-goog
On Fri, Aug 25, 2023 at 10:39 AM Jaegeuk Kim <jaegeuk@kernel.org> wrote: > > Hi Daniel, > > f2fs_format_main.c: In function ‘add_default_options’: > f2fs_format_main.c:142:41: error: ‘struct f2fs_configuration’ has no member named ‘blksize’ > 142 | c.wanted_sector_size = c.blksize; > | ^ > make[2]: *** [Makefile:516: f2fs_format_main.o] Error 1 > make[2]: *** Waiting for unfinished jobs.... > f2fs_format_main.c: In function 'add_default_options': > f2fs_format_main.c:142:41: error: 'struct f2fs_configuration' has no member named 'blksize' > 142 | c.wanted_sector_size = c.blksize; > | > Oof... Missed updating the patch files after my last rebase. I'll resend. Took the opportunity to move some changes in the last patch up to the first as well.
diff --git a/fsck/fsck.h b/fsck/fsck.h index 0f7caf4..89d0b22 100644 --- a/fsck/fsck.h +++ b/fsck/fsck.h @@ -126,7 +126,7 @@ struct f2fs_fsck { struct quota_ctx *qctx; }; -#define BLOCK_SZ 4096 +#define BLOCK_SZ F2FS_BLKSIZE struct block { unsigned char buf[BLOCK_SZ]; }; diff --git a/fsck/mount.c b/fsck/mount.c index 5e687a8..831a7a3 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -995,8 +995,8 @@ int sanity_check_raw_super(struct f2fs_super_block *sb, enum SB_ADDR sb_addr) blocksize = 1 << get_sb(log_blocksize); if (F2FS_BLKSIZE != blocksize) { - MSG(0, "Invalid blocksize (%u), supports only 4KB\n", - blocksize); + MSG(0, "Invalid blocksize (%u), supports only (%u)\n", + blocksize, F2FS_BLKSIZE); return -1; } diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 7e7db22..6975143 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -385,18 +385,18 @@ static inline uint64_t bswap_64(uint64_t val) #define SECTOR_SHIFT 9 #endif #define F2FS_SUPER_MAGIC 0xF2F52010 /* F2FS Magic Number */ -#define CP_CHKSUM_OFFSET 4092 +#define CP_CHKSUM_OFFSET (F2FS_BLKSIZE - sizeof(__le32)) #define SB_CHKSUM_OFFSET 3068 #define MAX_PATH_LEN 64 #define MAX_DEVICES 8 #define F2FS_BYTES_TO_BLK(bytes) ((bytes) >> F2FS_BLKSIZE_BITS) -#define F2FS_BLKSIZE_BITS 12 +#define F2FS_BLKSIZE_BITS 12 /* 4KB block */ /* for mkfs */ #define F2FS_NUMBER_OF_CHECKPOINT_PACK 2 #define DEFAULT_SECTOR_SIZE 512 -#define DEFAULT_SECTORS_PER_BLOCK 8 +#define DEFAULT_SECTORS_PER_BLOCK (1 << (F2FS_BLKSIZE_BITS - SECTOR_SHIFT)) #define DEFAULT_BLOCKS_PER_SEGMENT 512 #define DEFAULT_SEGMENTS_PER_SECTION 1 @@ -627,8 +627,8 @@ enum { */ #define F2FS_SUPER_OFFSET 1024 /* byte-size offset */ #define F2FS_MIN_LOG_SECTOR_SIZE 9 /* 9 bits for 512 bytes */ -#define F2FS_MAX_LOG_SECTOR_SIZE 12 /* 12 bits for 4096 bytes */ -#define F2FS_BLKSIZE 4096 /* support only 4KB block */ +#define F2FS_MAX_LOG_SECTOR_SIZE F2FS_BLKSIZE_BITS /* 12 bits for 4096 bytes */ +#define F2FS_BLKSIZE (1 << F2FS_BLKSIZE_BITS)/* support only 4KB block */ #define F2FS_MAX_EXTENSION 64 /* # of extension entries */ #define F2FS_EXTENSION_LEN 8 /* max size of extension */ #define F2FS_BLK_ALIGN(x) (((x) + F2FS_BLKSIZE - 1) / F2FS_BLKSIZE) @@ -642,7 +642,7 @@ enum { #define F2FS_META_INO(sbi) (sbi->meta_ino_num) #define F2FS_MAX_QUOTAS 3 -#define QUOTA_DATA 2 +#define QUOTA_DATA (((1024 * 6 - 1) / F2FS_BLKSIZE) + 1) #define QUOTA_INO(sb,t) (le32_to_cpu((sb)->qf_ino[t])) /* @@ -853,7 +853,7 @@ static_assert(sizeof(struct f2fs_checkpoint) == 192, ""); /* * For orphan inode management */ -#define F2FS_ORPHANS_PER_BLOCK 1020 +#define F2FS_ORPHANS_PER_BLOCK ((F2FS_BLKSIZE - 4 * sizeof(__le32)) / sizeof(__le32)) struct f2fs_orphan_block { __le32 ino[F2FS_ORPHANS_PER_BLOCK]; /* inode numbers */ @@ -864,7 +864,7 @@ struct f2fs_orphan_block { __le32 check_sum; /* CRC32 for orphan inode block */ }; -static_assert(sizeof(struct f2fs_orphan_block) == 4096, ""); +static_assert(sizeof(struct f2fs_orphan_block) == F2FS_BLKSIZE, ""); /* * For NODE structure @@ -884,13 +884,31 @@ static_assert(sizeof(struct f2fs_extent) == 12, ""); /* 200 bytes for inline xattrs by default */ #define DEFAULT_INLINE_XATTR_ADDRS 50 -#define DEF_ADDRS_PER_INODE 923 /* Address Pointers in an Inode */ + +struct node_footer { + __le32 nid; /* node id */ + __le32 ino; /* inode number */ + __le32 flag; /* include cold/fsync/dentry marks and offset */ + __le64 cp_ver __attribute__((packed)); /* checkpoint version */ + __le32 next_blkaddr; /* next node page block address */ +}; + +static_assert(sizeof(struct node_footer) == 24, ""); + +#define OFFSET_OF_END_OF_I_EXT 360 +#define SIZE_OF_I_NID 20 +/* Address Pointers in an Inode */ +#define DEF_ADDRS_PER_INODE ((F2FS_BLKSIZE - OFFSET_OF_END_OF_I_EXT \ + - SIZE_OF_I_NID \ + - sizeof(struct node_footer)) / sizeof(__le32)) #define CUR_ADDRS_PER_INODE(inode) (DEF_ADDRS_PER_INODE - \ __get_extra_isize(inode)) #define ADDRS_PER_INODE(i) addrs_per_inode(i) -#define DEF_ADDRS_PER_BLOCK 1018 /* Address Pointers in a Direct Block */ +/* Address Pointers in a Direct Block */ +#define DEF_ADDRS_PER_BLOCK ((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32)) #define ADDRS_PER_BLOCK(i) addrs_per_block(i) -#define NIDS_PER_BLOCK 1018 /* Node IDs in an Indirect Block */ +/* Node IDs in an Indirect Block */ +#define NIDS_PER_BLOCK ((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32)) #define NODE_DIR1_BLOCK (DEF_ADDRS_PER_INODE + 1) #define NODE_DIR2_BLOCK (DEF_ADDRS_PER_INODE + 2) @@ -1024,19 +1042,19 @@ struct f2fs_inode { static_assert(offsetof(struct f2fs_inode, i_extra_end) - offsetof(struct f2fs_inode, i_extra_isize) == 36, ""); -static_assert(sizeof(struct f2fs_inode) == 4072, ""); +static_assert(sizeof(struct f2fs_inode) == F2FS_BLKSIZE - 24, ""); struct direct_node { __le32 addr[DEF_ADDRS_PER_BLOCK]; /* array of data block address */ }; -static_assert(sizeof(struct direct_node) == 4072, ""); +static_assert(sizeof(struct direct_node) == F2FS_BLKSIZE - 24, ""); struct indirect_node { __le32 nid[NIDS_PER_BLOCK]; /* array of data block address */ }; -static_assert(sizeof(struct indirect_node) == 4072, ""); +static_assert(sizeof(struct indirect_node) == F2FS_BLKSIZE - 24, ""); enum { COLD_BIT_SHIFT = 0, @@ -1047,15 +1065,6 @@ enum { #define XATTR_NODE_OFFSET ((((unsigned int)-1) << OFFSET_BIT_SHIFT) \ >> OFFSET_BIT_SHIFT) -struct node_footer { - __le32 nid; /* node id */ - __le32 ino; /* inode nunmber */ - __le32 flag; /* include cold/fsync/dentry marks and offset */ - __le64 cp_ver __attribute__((packed)); /* checkpoint version */ - __le32 next_blkaddr; /* next node page block address */ -}; - -static_assert(sizeof(struct node_footer) == 24, ""); struct f2fs_node { /* can be one of three types: inode, direct, and indirect types */ @@ -1067,7 +1076,7 @@ struct f2fs_node { struct node_footer footer; }; -static_assert(sizeof(struct f2fs_node) == 4096, ""); +static_assert(sizeof(struct f2fs_node) == F2FS_BLKSIZE, ""); /* * For NAT entries @@ -1089,7 +1098,7 @@ struct f2fs_nat_block { struct f2fs_nat_entry entries[NAT_ENTRY_PER_BLOCK]; }; -static_assert(sizeof(struct f2fs_nat_block) == 4095, ""); +static_assert(sizeof(struct f2fs_nat_block) == F2FS_BLKSIZE - (F2FS_BLKSIZE % 9), ""); /* * For SIT entries @@ -1140,13 +1149,13 @@ struct f2fs_sit_block { struct f2fs_sit_entry entries[SIT_ENTRY_PER_BLOCK]; }; -static_assert(sizeof(struct f2fs_sit_block) == 4070, ""); +static_assert(sizeof(struct f2fs_sit_block) == F2FS_BLKSIZE - (F2FS_BLKSIZE % 74), ""); /* * For segment summary * - * One summary block contains exactly 512 summary entries, which represents - * exactly 2MB segment by default. Not allow to change the basic units. + * One summary block contains exactly 2048 summary entries, which represents + * exactly 32MB segment by default. Not allow to change the basic units. * * NOTE: For initializing fields, you must use set_summary * @@ -1157,7 +1166,7 @@ static_assert(sizeof(struct f2fs_sit_block) == 4070, ""); * from node's page's beginning to get a data block address. * ex) data_blkaddr = (block_t)(nodepage_start_address + ofs_in_node) */ -#define ENTRIES_IN_SUM 512 +#define ENTRIES_IN_SUM (F2FS_BLKSIZE / 8) #define SUMMARY_SIZE (7) /* sizeof(struct summary) */ #define SUM_FOOTER_SIZE (5) /* sizeof(struct summary_footer) */ #define SUM_ENTRIES_SIZE (SUMMARY_SIZE * ENTRIES_IN_SUM) @@ -1225,7 +1234,7 @@ struct nat_journal { __u8 reserved[NAT_JOURNAL_RESERVED]; }; -static_assert(sizeof(struct nat_journal) == 505, ""); +static_assert(sizeof(struct nat_journal) == (F2FS_BLKSIZE / 8) - 7, ""); struct sit_journal_entry { __le32 segno; @@ -1239,14 +1248,14 @@ struct sit_journal { __u8 reserved[SIT_JOURNAL_RESERVED]; }; -static_assert(sizeof(struct sit_journal) == 505, ""); +static_assert(sizeof(struct sit_journal) == (F2FS_BLKSIZE / 8) - 7, ""); struct f2fs_extra_info { __le64 kbytes_written; __u8 reserved[EXTRA_INFO_RESERVED]; } __attribute__((packed)); -static_assert(sizeof(struct f2fs_extra_info) == 505, ""); +static_assert(sizeof(struct f2fs_extra_info) == (F2FS_BLKSIZE / 8) - 7, ""); struct f2fs_journal { union { @@ -1261,7 +1270,7 @@ struct f2fs_journal { }; } __attribute__((packed)); -static_assert(sizeof(struct f2fs_journal) == 507, ""); +static_assert(sizeof(struct f2fs_journal) == (F2FS_BLKSIZE / 8) - 5, ""); /* 4KB-sized summary block structure */ struct f2fs_summary_block { @@ -1270,7 +1279,7 @@ struct f2fs_summary_block { struct summary_footer footer; }; -static_assert(sizeof(struct f2fs_summary_block) == 4096, ""); +static_assert(sizeof(struct f2fs_summary_block) == F2FS_BLKSIZE, ""); /* * For directory operations @@ -1289,8 +1298,8 @@ typedef __le32 f2fs_hash_t; #define GET_DENTRY_SLOTS(x) ((x + F2FS_SLOT_LEN - 1) >> F2FS_SLOT_LEN_BITS) /* the number of dentry in a block */ -#define NR_DENTRY_IN_BLOCK 214 - +#define NR_DENTRY_IN_BLOCK ((BITS_PER_BYTE * F2FS_BLKSIZE) / \ + ((SIZE_OF_DIR_ENTRY + F2FS_SLOT_LEN) * BITS_PER_BYTE + 1)) /* MAX level for dir lookup */ #define MAX_DIR_HASH_DEPTH 63 diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c index 019fb3a..7ad9acf 100644 --- a/mkfs/f2fs_format.c +++ b/mkfs/f2fs_format.c @@ -1372,7 +1372,7 @@ static int f2fs_write_default_quota(int qtype, __le32 raw_id) memcpy(filebuf + 5136, &dqblk, sizeof(struct v2r1_disk_dqblk)); - /* Write two blocks */ + /* Write quota blocks */ for (i = 0; i < QUOTA_DATA; i++) { blkaddr = alloc_next_free_block(CURSEG_HOT_DATA); @@ -1385,13 +1385,13 @@ static int f2fs_write_default_quota(int qtype, __le32 raw_id) update_sit_journal(CURSEG_HOT_DATA); update_summary_entry(CURSEG_HOT_DATA, le32_to_cpu(sb->qf_ino[qtype]), i); - } + DBG(1, "\tWriting quota data, at offset %08x (%d/%d)\n", + blkaddr, i + 1, QUOTA_DATA); - DBG(1, "\tWriting quota data, at offset %08x, %08x\n", - blkaddr - 1, blkaddr); + } free(filebuf); - return blkaddr - 1; + return blkaddr + 1 - QUOTA_DATA; } static int f2fs_write_qf_inode(int qtype) @@ -1426,7 +1426,7 @@ static int f2fs_write_qf_inode(int qtype) else ASSERT(0); - /* write two blocks */ + /* write quota blocks */ data_blkaddr = f2fs_write_default_quota(qtype, raw_id); if (data_blkaddr == 0) { free(raw_node); diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c index d8c9cea..c0f4253 100644 --- a/mkfs/f2fs_format_main.c +++ b/mkfs/f2fs_format_main.c @@ -141,7 +141,7 @@ static void add_default_options(void) /* -d1 -f -w 4096 -R 0:0 */ c.dbg_lv = 1; force_overwrite = 1; - c.wanted_sector_size = 4096; + c.wanted_sector_size = c.blksize; c.root_uid = c.root_gid = 0; /* RO doesn't need any other features */
This converts the various block size based constants to be defined in terms of the block size. This makes it possible to change the block size by changing only F2FS_BLKSIZE_BITS in f2fs_fs.h Signed-off-by: Daniel Rosenberg <drosen@google.com> --- fsck/fsck.h | 2 +- fsck/mount.c | 4 +- include/f2fs_fs.h | 81 +++++++++++++++++++++++------------------ mkfs/f2fs_format.c | 12 +++--- mkfs/f2fs_format_main.c | 2 +- 5 files changed, 55 insertions(+), 46 deletions(-)