When 16K page/block size is enabled in Android platform,
a error maybe detected in mount process in kernel if "-b"
parameters is not specified in mkfs.f2fs.
Just as the following check:
if (le32_to_cpu(raw_super->log_blocksize) != F2FS_BLKSIZE_BITS)

So use getpagesize() to get correct default blocksize.

Signed-off-by: Zhiguo Niu <zhiguo....@unisoc.com>
Signed-off-by: Xiuhong Wang <xiuhong.w...@unisoc.com>
---
 lib/libf2fs.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/libf2fs.c b/lib/libf2fs.c
index ecd22d4..98ee0ae 100644
--- a/lib/libf2fs.c
+++ b/lib/libf2fs.c
@@ -685,8 +685,17 @@ void f2fs_init_configuration(void)
 
        memset(&c, 0, sizeof(struct f2fs_configuration));
        c.ndevs = 1;
+#ifdef WITH_ANDROID
+       c.blksize = getpagesize();
+       c.blksize_bits = log_base_2(c.blksize);
+       if ((1 << c.blksize_bits) != c.blksize) {
+               c.blksize = 1 << DEFAULT_BLKSIZE_BITS;
+               c.blksize_bits = DEFAULT_BLKSIZE_BITS;
+       }
+#else
        c.blksize = 1 << DEFAULT_BLKSIZE_BITS;
        c.blksize_bits = DEFAULT_BLKSIZE_BITS;
+#endif
        c.sectors_per_blk = DEFAULT_SECTORS_PER_BLOCK;
        c.blks_per_seg = DEFAULT_BLOCKS_PER_SEGMENT;
        c.wanted_total_sectors = -1;
-- 
1.9.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

Reply via email to