f2fs: split wio_mutex

Split wio_mutex to adjust different temperature bio cache.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index f61e095947c81450ea9773d3ccbe86b23311f524..093d68a7ae4783f8542d9003f6c3c9067c77bc3e 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -894,7 +894,8 @@ struct f2fs_sb_info {
 
        /* for bio operations */
        struct f2fs_bio_info *write_io[NR_PAGE_TYPE];   /* for write bios */
-       struct mutex wio_mutex[NODE + 1];       /* bio ordering for NODE/DATA */
+       struct mutex wio_mutex[NR_PAGE_TYPE - 1][NR_TEMP_TYPE];
+                                               /* bio ordering for NODE/DATA */
        int write_io_size_bits;                 /* Write IO size bits */
        mempool_t *write_io_dummy;              /* Dummy pages */
 

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 7ac3a0c84bfd161d54f1885c79986681c0c296f6..63850e023c106e4f53df8862f057483738db4778 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -2154,7 +2154,7 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)
        int err;
 
        if (fio->type == NODE || fio->type == DATA)
-               mutex_lock(&fio->sbi->wio_mutex[fio->type]);
+               mutex_lock(&fio->sbi->wio_mutex[fio->type][fio->temp]);
 reallocate:
        allocate_data_block(fio->sbi, fio->page, fio->old_blkaddr,
                                        &fio->new_blkaddr, sum, type);
@@ -2167,7 +2167,7 @@ reallocate:
        }
 
        if (fio->type == NODE || fio->type == DATA)
-               mutex_unlock(&fio->sbi->wio_mutex[fio->type]);
+               mutex_unlock(&fio->sbi->wio_mutex[fio->type][fio->temp]);
 }
 
 void write_meta_page(struct f2fs_sb_info *sbi, struct page *page)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index aa451ec9fb809699c9adb7d91e48a35d9bbd48a8..b700766d0cbfc466051a841a6f8b5f2a28781733 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1571,7 +1571,7 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi)
 static void init_sb_info(struct f2fs_sb_info *sbi)
 {
        struct f2fs_super_block *raw_super = sbi->raw_super;
-       int i;
+       int i, j;
 
        sbi->log_sectors_per_block =
                le32_to_cpu(raw_super->log_sectors_per_block);
@@ -1603,8 +1603,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
 
        INIT_LIST_HEAD(&sbi->s_list);
        mutex_init(&sbi->umount_mutex);
-       mutex_init(&sbi->wio_mutex[NODE]);
-       mutex_init(&sbi->wio_mutex[DATA]);
+       for (i = 0; i < NR_PAGE_TYPE - 1; i++)
+               for (j = HOT; j < NR_TEMP_TYPE; j++)
+                       mutex_init(&sbi->wio_mutex[i][j]);
        spin_lock_init(&sbi->cp_lock);
 }