5 files changed, 25 insertions, 16 deletions

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index aaf22a912044..13ab72084913 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -85,7 +85,7 @@ static struct bio *__bio_alloc(struct f2fs_sb_info *sbi, block_t blk_addr,
         bio = bio_alloc(GFP_NOIO, npages);
 
         bio->bi_bdev = sbi->sb->s_bdev;
-        bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
+        bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(blk_addr);
         bio->bi_end_io = is_read ? f2fs_read_end_io : f2fs_write_end_io;
         bio->bi_private = sbi;
 
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 4ea53aab786d..24b768ae39c4 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -370,8 +370,8 @@ static void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno)
 static int f2fs_issue_discard(struct f2fs_sb_info *sbi,
                                 block_t blkstart, block_t blklen)
 {
-        sector_t start = SECTOR_FROM_BLOCK(sbi, blkstart);
-        sector_t len = SECTOR_FROM_BLOCK(sbi, blklen);
+        sector_t start = SECTOR_FROM_BLOCK(blkstart);
+        sector_t len = SECTOR_FROM_BLOCK(blklen);
         trace_f2fs_issue_discard(sbi->sb, blkstart, blklen);
         return blkdev_issue_discard(sbi->sb->s_bdev, start, len, GFP_NOFS, 0);
 }
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 848ac519958f..032c0905a12b 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -89,10 +89,10 @@
 #define TOTAL_SECS(sbi) (sbi->total_sections)
 #define TOTAL_BLKS(sbi) (SM_I(sbi)->segment_count << sbi->log_blocks_per_seg)
 
-#define SECTOR_FROM_BLOCK(sbi, blk_addr)                                \
-        (((sector_t)blk_addr) << (sbi)->log_sectors_per_block)
-#define SECTOR_TO_BLOCK(sbi, sectors)                                   \
-        (sectors >> (sbi)->log_sectors_per_block)
+#define SECTOR_FROM_BLOCK(blk_addr)                                     \
+        (((sector_t)blk_addr) << F2FS_LOG_SECTORS_PER_BLOCK)
+#define SECTOR_TO_BLOCK(sectors)                                        \
+        (sectors >> F2FS_LOG_SECTORS_PER_BLOCK)
 #define MAX_BIO_BLOCKS(sbi)                                             \
         ((int)min((int)max_hw_blocks(sbi), BIO_MAX_PAGES))
 
@@ -711,7 +711,7 @@ static inline unsigned int max_hw_blocks(struct f2fs_sb_info *sbi)
 {
         struct block_device *bdev = sbi->sb->s_bdev;
         struct request_queue *q = bdev_get_queue(bdev);
-        return SECTOR_TO_BLOCK(sbi, queue_max_sectors(q));
+        return SECTOR_TO_BLOCK(queue_max_sectors(q));
 }
 
 /*
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index ed4095e5e8a7..3dfa1b5eae2f 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -788,14 +788,22 @@ static int sanity_check_raw_super(struct super_block *sb,
                 return 1;
         }
 
-        if (le32_to_cpu(raw_super->log_sectorsize) !=
-                                        F2FS_LOG_SECTOR_SIZE) {
-                f2fs_msg(sb, KERN_INFO, "Invalid log sectorsize");
+        /* Currently, support 512/1024/2048/4096 bytes sector size */
+        if (le32_to_cpu(raw_super->log_sectorsize) >
+                                F2FS_MAX_LOG_SECTOR_SIZE ||
+                le32_to_cpu(raw_super->log_sectorsize) <
+                                F2FS_MIN_LOG_SECTOR_SIZE) {
+                f2fs_msg(sb, KERN_INFO, "Invalid log sectorsize (%u)",
+                        le32_to_cpu(raw_super->log_sectorsize));
                 return 1;
         }
-        if (le32_to_cpu(raw_super->log_sectors_per_block) !=
-                                        F2FS_LOG_SECTORS_PER_BLOCK) {
-                f2fs_msg(sb, KERN_INFO, "Invalid log sectors per block");
+        if (le32_to_cpu(raw_super->log_sectors_per_block) +
+                le32_to_cpu(raw_super->log_sectorsize) !=
+                        F2FS_MAX_LOG_SECTOR_SIZE) {
+                f2fs_msg(sb, KERN_INFO,
+                        "Invalid log sectors per block(%u) log sectorsize(%u)",
+                        le32_to_cpu(raw_super->log_sectors_per_block),
+                        le32_to_cpu(raw_super->log_sectorsize));
                 return 1;
         }
         return 0;
diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index 9ca1ff3d4662..860313a33a43 100644
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -15,8 +15,9 @@
 #include <linux/types.h>
 
 #define F2FS_SUPER_OFFSET               1024    /* byte-size offset */
-#define F2FS_LOG_SECTOR_SIZE            9       /* 9 bits for 512 byte */
-#define F2FS_LOG_SECTORS_PER_BLOCK      3       /* 4KB: F2FS_BLKSIZE */
+#define F2FS_MIN_LOG_SECTOR_SIZE        9       /* 9 bits for 512 bytes */
+#define F2FS_MAX_LOG_SECTOR_SIZE        12      /* 12 bits for 4096 bytes */
+#define F2FS_LOG_SECTORS_PER_BLOCK      3       /* log number for sector/blk */
 #define F2FS_BLKSIZE                    4096    /* support only 4KB block */
 #define F2FS_MAX_EXTENSION              64      /* # of extension entries */
 #define F2FS_BLK_ALIGN(x)       (((x) + F2FS_BLKSIZE - 1) / F2FS_BLKSIZE)