aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/f2fs/f2fs.h1
-rw-r--r--fs/f2fs/super.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 1e031971a466..68f0042a810c 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1170,7 +1170,6 @@ struct f2fs_sb_info {
1170 1170
1171 /* for bio operations */ 1171 /* for bio operations */
1172 struct f2fs_bio_info *write_io[NR_PAGE_TYPE]; /* for write bios */ 1172 struct f2fs_bio_info *write_io[NR_PAGE_TYPE]; /* for write bios */
1173 struct mutex wio_mutex[NR_PAGE_TYPE - 1][NR_TEMP_TYPE];
1174 /* bio ordering for NODE/DATA */ 1173 /* bio ordering for NODE/DATA */
1175 /* keep migration IO order for LFS mode */ 1174 /* keep migration IO order for LFS mode */
1176 struct rw_semaphore io_order_lock; 1175 struct rw_semaphore io_order_lock;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index af58b2cc21b8..2d18de5e7c3f 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2674,7 +2674,7 @@ int f2fs_sanity_check_ckpt(struct f2fs_sb_info *sbi)
2674static void init_sb_info(struct f2fs_sb_info *sbi) 2674static void init_sb_info(struct f2fs_sb_info *sbi)
2675{ 2675{
2676 struct f2fs_super_block *raw_super = sbi->raw_super; 2676 struct f2fs_super_block *raw_super = sbi->raw_super;
2677 int i, j; 2677 int i;
2678 2678
2679 sbi->log_sectors_per_block = 2679 sbi->log_sectors_per_block =
2680 le32_to_cpu(raw_super->log_sectors_per_block); 2680 le32_to_cpu(raw_super->log_sectors_per_block);
@@ -2710,9 +2710,6 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
2710 2710
2711 INIT_LIST_HEAD(&sbi->s_list); 2711 INIT_LIST_HEAD(&sbi->s_list);
2712 mutex_init(&sbi->umount_mutex); 2712 mutex_init(&sbi->umount_mutex);
2713 for (i = 0; i < NR_PAGE_TYPE - 1; i++)
2714 for (j = HOT; j < NR_TEMP_TYPE; j++)
2715 mutex_init(&sbi->wio_mutex[i][j]);
2716 init_rwsem(&sbi->io_order_lock); 2713 init_rwsem(&sbi->io_order_lock);
2717 spin_lock_init(&sbi->cp_lock); 2714 spin_lock_init(&sbi->cp_lock);
2718 2715