Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ab587cc authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: split wio_mutex 



commit e41e6d75e5010741f01f8aa4f77a5e8a1786652d upstream.

Split wio_mutex to adjust different temperature bio cache.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent a8ca3973

fs/f2fs/f2fs.h

+2 −1
Original line number Diff line number Diff line
@@ -993,7 +993,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 */

fs/f2fs/segment.c

+2 −2
Original line number Diff line number Diff line
@@ -2233,7 +2233,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);
@@ -2246,7 +2246,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)

fs/f2fs/super.c

+4 −3
Original line number Diff line number Diff line
@@ -1561,7 +1561,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);
@@ -1593,8 +1593,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);

}