diff options
| author | Daniel Rosenberg <drosen@google.com> | 2024-01-26 14:18:44 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2024-01-29 12:14:52 -0800 |
| commit | 9f435e3d57d3ab478d37ce0398ae9095425a48df (patch) | |
| tree | b58b9524d23676aa18b82adfb8c3cce59dfad6ff | |
| parent | dff4893b4923305a1f5e71c724d945e150f38265 (diff) | |
| download | f2fs-tools-9f435e3d57d3ab478d37ce0398ae9095425a48df.tar.gz | |
libf2fs: Accept Sparse files with non 4K Blocksize
Since we may not know the block size when initializing sparse files, we
should assume that the sparse file's blocksize is correct.
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/mount.c | 20 | ||||
| -rw-r--r-- | lib/libf2fs_io.c | 11 |
2 files changed, 20 insertions, 11 deletions
diff --git a/fsck/mount.c b/fsck/mount.c index 345556d..50afd01 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -995,6 +995,10 @@ int sanity_check_raw_super(struct f2fs_super_block *sb, enum SB_ADDR sb_addr) return -1; blocksize = 1 << get_sb(log_blocksize); + if (c.sparse_mode && F2FS_BLKSIZE != blocksize) { + MSG(0, "Invalid blocksize (%u), does not equal sparse file blocksize (%u)", + F2FS_BLKSIZE, blocksize); + } if (blocksize < F2FS_MIN_BLKSIZE || blocksize > F2FS_MAX_BLKSIZE) { MSG(0, "Invalid blocksize (%u), must be between 4KB and 16KB\n", blocksize); @@ -3965,20 +3969,22 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi) sbi->active_logs = NR_CURSEG_TYPE; ret = validate_super_block(sbi, SB0_ADDR); if (ret) { - /* Assuming 4K Block Size */ - c.blksize_bits = 12; - c.blksize = 1 << c.blksize_bits; - MSG(0, "Looking for secondary superblock assuming 4K Block Size\n"); + if (!c.sparse_mode) { + /* Assuming 4K Block Size */ + c.blksize_bits = 12; + c.blksize = 1 << c.blksize_bits; + MSG(0, "Looking for secondary superblock assuming 4K Block Size\n"); + } ret = validate_super_block(sbi, SB1_ADDR); - if (ret) { + if (ret && !c.sparse_mode) { /* Trying 16K Block Size */ c.blksize_bits = 14; c.blksize = 1 << c.blksize_bits; MSG(0, "Looking for secondary superblock assuming 16K Block Size\n"); ret = validate_super_block(sbi, SB1_ADDR); - if (ret) - return -1; } + if (ret) + return -1; } sb = F2FS_RAW_SUPER(sbi); c.cache_config.num_cache_entry = num_cache_entry; diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c index 18a1a3c..b2d6933 100644 --- a/lib/libf2fs_io.c +++ b/lib/libf2fs_io.c @@ -667,14 +667,17 @@ int f2fs_init_sparse_file(void) if (!f2fs_sparse_file) return -1; + c.blksize = sparse_file_block_size(f2fs_sparse_file); + c.blksize_bits = log_base_2(c.blksize); + if (c.blksize_bits == -1) { + MSG(0, "\tError: Sparse file blocksize not a power of 2.\n"); + return -1; + } + c.device_size = sparse_file_len(f2fs_sparse_file, 0, 0); c.device_size &= (~((uint64_t)(F2FS_BLKSIZE - 1))); } - if (sparse_file_block_size(f2fs_sparse_file) != F2FS_BLKSIZE) { - MSG(0, "\tError: Corrupted sparse file\n"); - return -1; - } blocks_count = c.device_size / F2FS_BLKSIZE; blocks = calloc(blocks_count, sizeof(char *)); if (!blocks) { |