From: Daniel Rosenberg via Linux-f2fs-devel <linux-f2fs-devel@lists.sourceforge.net>
To: linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>,
kernel-team@android.com, Daniel Rosenberg <drosen@google.com>
Subject: [f2fs-dev] [PATCH v3 6/7] f2fs-tools: Refactor f2fs_dentry_block struct
Date: Mon, 28 Aug 2023 18:05:35 -0700 [thread overview]
Message-ID: <20230829010536.3044883-7-drosen@google.com> (raw)
In-Reply-To: <20230829010536.3044883-1-drosen@google.com>
This moves access to f2fs_dentry_block's dentry list and filename list
behind a macro, as their locations depend on block size.
Since struct f2fs_dentry_block no longer represents the full block, use
F2FS_BLKSIZE instead of sizeof(struct f2fs_dentry_block)
Signed-off-by: Daniel Rosenberg <drosen@google.com>
---
fsck/dir.c | 26 +++++++++++-----------
fsck/fsck.c | 2 +-
include/f2fs_fs.h | 30 ++++++++++++++++++++------
mkfs/f2fs_format.c | 54 +++++++++++++++++++++++-----------------------
4 files changed, 65 insertions(+), 47 deletions(-)
diff --git a/fsck/dir.c b/fsck/dir.c
index 64beaad..21d9da3 100644
--- a/fsck/dir.c
+++ b/fsck/dir.c
@@ -43,8 +43,8 @@ void make_dentry_ptr(struct f2fs_dentry_ptr *d, struct f2fs_node *node_blk,
d->max = NR_DENTRY_IN_BLOCK;
d->nr_bitmap = SIZE_OF_DENTRY_BITMAP;
d->bitmap = t->dentry_bitmap;
- d->dentry = t->dentry;
- d->filename = t->filename;
+ d->dentry = F2FS_DENTRY_BLOCK_DENTRIES(t);
+ d->filename = F2FS_DENTRY_BLOCK_FILENAMES(t);
} else {
int entry_cnt = NR_INLINE_DENTRY(node_blk);
int bitmap_size = INLINE_DENTRY_BITMAP_SIZE(node_blk);
@@ -352,17 +352,17 @@ static void make_empty_dir(struct f2fs_sb_info *sbi, struct f2fs_node *inode)
dent_blk = calloc(BLOCK_SZ, 1);
ASSERT(dent_blk);
- dent_blk->dentry[0].hash_code = 0;
- dent_blk->dentry[0].ino = cpu_to_le32(ino);
- dent_blk->dentry[0].name_len = cpu_to_le16(1);
- dent_blk->dentry[0].file_type = F2FS_FT_DIR;
- memcpy(dent_blk->filename[0], ".", 1);
-
- dent_blk->dentry[1].hash_code = 0;
- dent_blk->dentry[1].ino = cpu_to_le32(pino);
- dent_blk->dentry[1].name_len = cpu_to_le16(2);
- dent_blk->dentry[1].file_type = F2FS_FT_DIR;
- memcpy(dent_blk->filename[1], "..", 2);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).hash_code = 0;
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).ino = cpu_to_le32(ino);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).name_len = cpu_to_le16(1);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).file_type = F2FS_FT_DIR;
+ memcpy(F2FS_DENTRY_BLOCK_FILENAME(dent_blk, 0), ".", 1);
+
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).hash_code = 0;
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).ino = cpu_to_le32(pino);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).name_len = cpu_to_le16(2);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).file_type = F2FS_FT_DIR;
+ memcpy(F2FS_DENTRY_BLOCK_FILENAME(dent_blk, 1), "..", 2);
test_and_set_bit_le(0, dent_blk->dentry_bitmap);
test_and_set_bit_le(1, dent_blk->dentry_bitmap);
diff --git a/fsck/fsck.c b/fsck/fsck.c
index e605d3c..13494b0 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -1963,7 +1963,7 @@ int fsck_chk_dentry_blk(struct f2fs_sb_info *sbi, int casefolded, u32 blk_addr,
dentries = __chk_dentries(sbi, casefolded, child,
de_blk->dentry_bitmap,
- de_blk->dentry, de_blk->filename,
+ F2FS_DENTRY_BLOCK_DENTRIES(de_blk), F2FS_DENTRY_BLOCK_FILENAMES(de_blk),
NR_DENTRY_IN_BLOCK, last_blk, enc_name);
if (dentries < 0 && f2fs_dev_is_writable()) {
diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
index fc65670..edc2eaf 100644
--- a/include/f2fs_fs.h
+++ b/include/f2fs_fs.h
@@ -1365,16 +1365,29 @@ struct f2fs_dir_entry {
static_assert(sizeof(struct f2fs_dir_entry) == 11, "");
-/* 4KB-sized directory entry block */
+/*
+ * Block-sized directory entry block
+ * On disk structure:
+ * struct f2fs_dentry_block;
+ * __u8 reserved[SIZE_OF_RESERVED];
+ * struct f2fs_dir_entry dentry[NR_DENTRY_IN_BLOCK];
+ * __u8 filename[NR_DENTRY_IN_BLOCK][F2FS_SLOT_LEN];
+ *
+ * Do NOT use sizeof. Use F2FS_BLKSIZE instead
+ */
struct f2fs_dentry_block {
/* validity bitmap for directory entries in each block */
- __u8 dentry_bitmap[SIZE_OF_DENTRY_BITMAP];
- __u8 reserved[SIZE_OF_RESERVED];
- struct f2fs_dir_entry dentry[NR_DENTRY_IN_BLOCK];
- __u8 filename[NR_DENTRY_IN_BLOCK][F2FS_SLOT_LEN];
+ __u8 dentry_bitmap[0]; /* size is SIZE_OF_DENTRY_BITMAP, based on block size */
};
-static_assert(sizeof(struct f2fs_dentry_block) == F2FS_BLKSIZE, "");
+#define F2FS_DENTRY_BLOCK_DENTRIES(blk) ((struct f2fs_dir_entry *)\
+ &((blk)->dentry_bitmap[SIZE_OF_DENTRY_BITMAP + SIZE_OF_RESERVED]))
+#define F2FS_DENTRY_BLOCK_DENTRY(blk, i) (F2FS_DENTRY_BLOCK_DENTRIES((blk))[(i)])
+
+#define F2FS_DENTRY_BLOCK_FILENAMES(blk) ((__u8(*)[F2FS_SLOT_LEN])&F2FS_DENTRY_BLOCK_DENTRY(blk,\
+ NR_DENTRY_IN_BLOCK))
+#define F2FS_DENTRY_BLOCK_FILENAME(blk, i) (&((__u8 *)&F2FS_DENTRY_BLOCK_DENTRY(blk,\
+ NR_DENTRY_IN_BLOCK))[(i) * F2FS_SLOT_LEN])
/* for inline stuff */
#define DEF_INLINE_RESERVED_SIZE 1
@@ -2043,6 +2056,11 @@ static inline void check_block_struct_sizes(void)
assert(sizeof(struct f2fs_summary) * ENTRIES_IN_SUM + sizeof(__le64)
+ offsetof(struct f2fs_journal, info)
+ EXTRA_INFO_RESERVED + sizeof(struct summary_footer) == F2FS_BLKSIZE);
+
+ /* Check Dentry Block Size */
+ assert(sizeof(__u8) * (SIZE_OF_DENTRY_BITMAP + SIZE_OF_RESERVED)
+ + NR_DENTRY_IN_BLOCK * sizeof(struct f2fs_dir_entry)
+ + NR_DENTRY_IN_BLOCK * F2FS_SLOT_LEN * sizeof(u8) == F2FS_BLKSIZE);
}
#endif /*__F2FS_FS_H */
diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index 740e752..f2840c8 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -1217,17 +1217,17 @@ static block_t f2fs_add_default_dentry_root(void)
return 0;
}
- dent_blk->dentry[0].hash_code = 0;
- dent_blk->dentry[0].ino = sb->root_ino;
- dent_blk->dentry[0].name_len = cpu_to_le16(1);
- dent_blk->dentry[0].file_type = F2FS_FT_DIR;
- memcpy(dent_blk->filename[0], ".", 1);
-
- dent_blk->dentry[1].hash_code = 0;
- dent_blk->dentry[1].ino = sb->root_ino;
- dent_blk->dentry[1].name_len = cpu_to_le16(2);
- dent_blk->dentry[1].file_type = F2FS_FT_DIR;
- memcpy(dent_blk->filename[1], "..", 2);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).hash_code = 0;
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).ino = sb->root_ino;
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).name_len = cpu_to_le16(1);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).file_type = F2FS_FT_DIR;
+ memcpy(F2FS_DENTRY_BLOCK_FILENAME(dent_blk, 0), ".", 1);
+
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).hash_code = 0;
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).ino = sb->root_ino;
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).name_len = cpu_to_le16(2);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).file_type = F2FS_FT_DIR;
+ memcpy(F2FS_DENTRY_BLOCK_FILENAME(dent_blk, 1), "..", 2);
/* bitmap for . and .. */
test_and_set_bit_le(0, dent_blk->dentry_bitmap);
@@ -1237,13 +1237,13 @@ static block_t f2fs_add_default_dentry_root(void)
int len = strlen(LPF);
f2fs_hash_t hash = f2fs_dentry_hash(0, 0, (unsigned char *)LPF, len);
- dent_blk->dentry[2].hash_code = cpu_to_le32(hash);
- dent_blk->dentry[2].ino = cpu_to_le32(c.lpf_ino);
- dent_blk->dentry[2].name_len = cpu_to_le16(len);
- dent_blk->dentry[2].file_type = F2FS_FT_DIR;
- memcpy(dent_blk->filename[2], LPF, F2FS_SLOT_LEN);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 2).hash_code = cpu_to_le32(hash);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 2).ino = cpu_to_le32(c.lpf_ino);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 2).name_len = cpu_to_le16(len);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 2).file_type = F2FS_FT_DIR;
+ memcpy(F2FS_DENTRY_BLOCK_FILENAME(dent_blk, 2), LPF, F2FS_SLOT_LEN);
- memcpy(dent_blk->filename[3], &LPF[F2FS_SLOT_LEN],
+ memcpy(F2FS_DENTRY_BLOCK_FILENAME(dent_blk, 3), &LPF[F2FS_SLOT_LEN],
len - F2FS_SLOT_LEN);
test_and_set_bit_le(2, dent_blk->dentry_bitmap);
@@ -1494,17 +1494,17 @@ static block_t f2fs_add_default_dentry_lpf(void)
return 0;
}
- dent_blk->dentry[0].hash_code = 0;
- dent_blk->dentry[0].ino = cpu_to_le32(c.lpf_ino);
- dent_blk->dentry[0].name_len = cpu_to_le16(1);
- dent_blk->dentry[0].file_type = F2FS_FT_DIR;
- memcpy(dent_blk->filename[0], ".", 1);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).hash_code = 0;
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).ino = cpu_to_le32(c.lpf_ino);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).name_len = cpu_to_le16(1);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 0).file_type = F2FS_FT_DIR;
+ memcpy(F2FS_DENTRY_BLOCK_FILENAME(dent_blk, 0), ".", 1);
- dent_blk->dentry[1].hash_code = 0;
- dent_blk->dentry[1].ino = sb->root_ino;
- dent_blk->dentry[1].name_len = cpu_to_le16(2);
- dent_blk->dentry[1].file_type = F2FS_FT_DIR;
- memcpy(dent_blk->filename[1], "..", 2);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).hash_code = 0;
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).ino = sb->root_ino;
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).name_len = cpu_to_le16(2);
+ F2FS_DENTRY_BLOCK_DENTRY(dent_blk, 1).file_type = F2FS_FT_DIR;
+ memcpy(F2FS_DENTRY_BLOCK_FILENAME(dent_blk, 1), "..", 2);
test_and_set_bit_le(0, dent_blk->dentry_bitmap);
test_and_set_bit_le(1, dent_blk->dentry_bitmap);
--
2.42.0.rc2.253.gd59a3bf2b4-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2023-08-29 1:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 1:05 [f2fs-dev] [PATCH v3 0/7] Add 16K Support for f2fs-tools Daniel Rosenberg via Linux-f2fs-devel
2023-08-29 1:05 ` [f2fs-dev] [PATCH v3 1/7] f2fs-tools: Define constants in terms of BLKSIZE Daniel Rosenberg via Linux-f2fs-devel
2023-08-29 1:05 ` [f2fs-dev] [PATCH v3 2/7] f2fs-tools: Refactor Orphan Block struct Daniel Rosenberg via Linux-f2fs-devel
2023-08-29 1:05 ` [f2fs-dev] [PATCH v3 3/7] f2fs-tools: Refactor f2fs_node struct and friends Daniel Rosenberg via Linux-f2fs-devel
2023-08-29 1:05 ` [f2fs-dev] [PATCH v3 4/7] f2fs-tools: Refactor SIT/NAT block structs Daniel Rosenberg via Linux-f2fs-devel
2023-08-29 1:05 ` [f2fs-dev] [PATCH v3 5/7] f2fs-tools: Refactor Summary block struct and friends Daniel Rosenberg via Linux-f2fs-devel
2023-08-29 1:05 ` Daniel Rosenberg via Linux-f2fs-devel [this message]
2023-08-29 1:05 ` [f2fs-dev] [PATCH v3 7/7] f2fs-tools: Support different block sizes Daniel Rosenberg via Linux-f2fs-devel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230829010536.3044883-7-drosen@google.com \
--to=linux-f2fs-devel@lists.sourceforge.net \
--cc=drosen@google.com \
--cc=jaegeuk@kernel.org \
--cc=kernel-team@android.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.