fsck.f2fs: readahead node blocks to speed up
This patch adds readahead system call to speed up node block reads.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
diff --git a/fsck/fsck.c b/fsck/fsck.c
index a5f9adc..9d6fc42 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -451,6 +451,19 @@
goto check;
}
+ /* readahead node blocks */
+ for (idx = 0; idx < 5; idx++) {
+ u32 nid = le32_to_cpu(node_blk->i.i_nid[idx]);
+
+ if (nid != 0) {
+ struct node_info ni;
+
+ get_node_info(sbi, nid, &ni);
+ if (IS_VALID_BLK_ADDR(sbi, ni.blk_addr))
+ dev_reada_block(ni.blk_addr);
+ }
+ }
+
/* check data blocks in inode */
for (idx = 0; idx < ADDRS_PER_INODE(&node_blk->i); idx++) {
if (le32_to_cpu(node_blk->i.i_addr[idx]) != 0) {
@@ -651,12 +664,31 @@
int dentries = 0;
u32 blk_cnt;
u8 *name;
- u32 hash_code;
+ u32 hash_code, ino;
u16 name_len;;
int ret = 0;
int fixed = 0;
int i;
+ /* readahead inode blocks */
+ for (i = 0; i < max;) {
+ if (test_bit(i, bitmap) == 0) {
+ i++;
+ continue;
+ }
+ ino = le32_to_cpu(dentry[i].ino);
+
+ if (IS_VALID_NID(sbi, ino)) {
+ struct node_info ni;
+
+ get_node_info(sbi, ino, &ni);
+ if (IS_VALID_BLK_ADDR(sbi, ni.blk_addr))
+ dev_reada_block(ni.blk_addr);
+ }
+ name_len = le16_to_cpu(dentry[i].name_len);
+ i += (name_len + F2FS_SLOT_LEN - 1) / F2FS_SLOT_LEN;
+ }
+
for (i = 0; i < max;) {
if (test_bit(i, bitmap) == 0) {
i++;
diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
index d062b7f..e7fb8fa 100644
--- a/include/f2fs_fs.h
+++ b/include/f2fs_fs.h
@@ -781,6 +781,7 @@
extern int dev_read_block(void *, __u64);
extern int dev_read_blocks(void *, __u64, __u32 );
+extern int dev_reada_block(__u64);
extern int dev_read_version(void *, __u64, size_t);
extern void get_kernel_version(__u8 *);
diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c
index 6ed45fd..afa345f 100644
--- a/lib/libf2fs_io.c
+++ b/lib/libf2fs_io.c
@@ -46,6 +46,15 @@
return 0;
}
+int dev_readahead(__u64 offset, size_t len)
+{
+#ifdef POSIX_FADV_WILLNEED
+ return posix_fadvise(config.fd, offset, len, POSIX_FADV_WILLNEED);
+#else
+ return 0;
+#endif
+}
+
int dev_write(void *buf, __u64 offset, size_t len)
{
if (lseek64(config.fd, (off64_t)offset, SEEK_SET) < 0)
@@ -91,6 +100,11 @@
return dev_read(buf, addr * F2FS_BLKSIZE, nr_blks * F2FS_BLKSIZE);
}
+int dev_reada_block(__u64 blk_addr)
+{
+ return dev_readahead(blk_addr * F2FS_BLKSIZE, F2FS_BLKSIZE);
+}
+
void f2fs_finalize_device(struct f2fs_configuration *c)
{
/*
