This patch fixes to initialize NAT/SIT/CP.payload region in sparse file mode for fsck/sload/resize/defrag/dump tools.
Signed-off-by: Chao Yu <[email protected]> --- v3: - print message after variable assignment. - use DEFAULT_BLOCKS_PER_SEGMENT instead of get_sb(log_blocks_per_seg). fsck/fsck.h | 1 + fsck/main.c | 5 +++ fsck/mount.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/libf2fs_io.c | 9 ------ 4 files changed, 88 insertions(+), 9 deletions(-) diff --git a/fsck/fsck.h b/fsck/fsck.h index dd831de..95bb7d3 100644 --- a/fsck/fsck.h +++ b/fsck/fsck.h @@ -181,6 +181,7 @@ extern int fsck_verify(struct f2fs_sb_info *); extern void fsck_free(struct f2fs_sb_info *); extern int f2fs_do_mount(struct f2fs_sb_info *); extern void f2fs_do_umount(struct f2fs_sb_info *); +extern int f2fs_update_sparse_file(struct f2fs_sb_info *); extern void flush_journal_entries(struct f2fs_sb_info *); extern void zero_journal_entries(struct f2fs_sb_info *); diff --git a/fsck/main.c b/fsck/main.c index afdfec9..0670696 100644 --- a/fsck/main.c +++ b/fsck/main.c @@ -845,6 +845,11 @@ retry: goto fsck_again; } } + + ret = f2fs_update_sparse_file(sbi); + if (ret < 0) + return ret; + ret = f2fs_finalize_device(); if (ret < 0) return ret; diff --git a/fsck/mount.c b/fsck/mount.c index 843742e..9c73cda 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -2721,3 +2721,85 @@ void f2fs_do_umount(struct f2fs_sb_info *sbi) free(sbi->ckpt); free(sbi->raw_super); } + +#ifdef WITH_ANDROID +static int sparse_initialize_meta(struct f2fs_sb_info *sbi) +{ + u_int32_t sit_seg_count, sit_size; + u_int32_t nat_seg_count, nat_size; + u_int64_t sit_seg_addr, nat_seg_addr, payload_addr; + u_int32_t seg_size = DEFAULT_BLOCKS_PER_SEGMENT; + int ret; + + sit_seg_addr = get_sb(sit_blkaddr); + sit_seg_count = get_sb(segment_count_sit); + sit_size = sit_seg_count * seg_size; + + DBG(1, "\tSparse: filling sit area at block offset: 0x%08"PRIx64" len: %u\n", + sit_seg_addr, sit_size); + ret = dev_fill(NULL, sit_seg_addr * F2FS_BLKSIZE, + sit_size * F2FS_BLKSIZE); + if (ret) { + MSG(1, "\tError: While zeroing out the sit area " + "on disk!!!\n"); + return -1; + } + + nat_seg_addr = get_sb(nat_blkaddr); + nat_seg_count = get_sb(segment_count_nat); + nat_size = nat_seg_count * seg_size; + + DBG(1, "\tSparse: filling nat area at block offset 0x%08"PRIx64" len: %u\n", + nat_seg_addr, nat_size); + ret = dev_fill(NULL, nat_seg_addr * F2FS_BLKSIZE, + nat_size * F2FS_BLKSIZE); + if (ret) { + MSG(1, "\tError: While zeroing out the nat area " + "on disk!!!\n"); + return -1; + } + + payload_addr = get_sb(segment0_blkaddr) + 1; + + DBG(1, "\tSparse: filling bitmap area at block offset 0x%08"PRIx64" len: %u\n", + payload_addr, get_sb(cp_payload)); + ret = dev_fill(NULL, payload_addr * F2FS_BLKSIZE, + get_sb(cp_payload) * F2FS_BLKSIZE); + if (ret) { + MSG(1, "\tError: While zeroing out the nat/sit bitmap area " + "on disk!!!\n"); + return -1; + } + + payload_addr += seg_size; + + DBG(1, "\tSparse: filling bitmap area at block offset 0x%08"PRIx64" len: %u\n", + payload_addr, get_sb(cp_payload)); + ret = dev_fill(NULL, payload_addr * F2FS_BLKSIZE, + get_sb(cp_payload) * F2FS_BLKSIZE); + if (ret) { + MSG(1, "\tError: While zeroing out the nat/sit bitmap area " + "on disk!!!\n"); + return -1; + } + return 0; +} + +int f2fs_update_sparse_file(struct f2fs_sb_info *sbi) +{ + int ret; + + if (!c.sparse_mode) + return 0; + + sparse_file_destroy(f2fs_sparse_file); + ret = ftruncate(c.devices[0].fd, 0); + ASSERT(!ret); + lseek(c.devices[0].fd, 0, SEEK_SET); + f2fs_sparse_file = sparse_file_new(F2FS_BLKSIZE, c.device_size); + + return sparse_initialize_meta(sbi); +} +#else +int f2fs_update_sparse_file(struct f2fs_sb_info *sbi) { return 0; } +#endif diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c index 4d0ea0d..2f2b6bd 100644 --- a/lib/libf2fs_io.c +++ b/lib/libf2fs_io.c @@ -358,15 +358,6 @@ int f2fs_finalize_device(void) int64_t chunk_start = (blocks[0] == NULL) ? -1 : 0; uint64_t j; - if (c.func != MKFS) { - sparse_file_destroy(f2fs_sparse_file); - ret = ftruncate(c.devices[0].fd, 0); - ASSERT(!ret); - lseek(c.devices[0].fd, 0, SEEK_SET); - f2fs_sparse_file = sparse_file_new(F2FS_BLKSIZE, - c.device_size); - } - for (j = 0; j < blocks_count; ++j) { if (chunk_start != -1) { if (j - chunk_start >= MAX_CHUNK_COUNT) { -- 2.18.0.rc1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
