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

Commit 8536d95f authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: correct wrong spelling, issing_* 



Let's use "queued" instead of "issuing".

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

fs/f2fs/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) 
		si->nr_flushed =

			atomic_read(&SM_I(sbi)->fcc_info->issued_flush);

		si->nr_flushing =

			atomic_read(&SM_I(sbi)->fcc_info->issing_flush);

			atomic_read(&SM_I(sbi)->fcc_info->queued_flush);

		si->flush_list_empty =

			llist_empty(&SM_I(sbi)->fcc_info->issue_list);

	}
@@ -72,7 +72,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) 
		si->nr_discarded =

			atomic_read(&SM_I(sbi)->dcc_info->issued_discard);

		si->nr_discarding =

			atomic_read(&SM_I(sbi)->dcc_info->issing_discard);

			atomic_read(&SM_I(sbi)->dcc_info->queued_discard);

		si->nr_discard_cmd =

			atomic_read(&SM_I(sbi)->dcc_info->discard_cmd_cnt);

		si->undiscard_blks = SM_I(sbi)->dcc_info->undiscard_blks;

fs/f2fs/f2fs.h

+5 −5
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ struct discard_cmd { 
	struct block_device *bdev;	/* bdev */

	unsigned short ref;		/* reference count */

	unsigned char state;		/* state */

	unsigned char issuing;		/* issuing discard */

	unsigned char queued;		/* queued discard */

	int error;			/* bio error */

	spinlock_t lock;		/* for state/bio_ref updating */

	unsigned short bio_ref;		/* bio reference count */
@@ -328,7 +328,7 @@ struct discard_cmd_control { 
	unsigned int undiscard_blks;		/* # of undiscard blocks */

	unsigned int next_pos;			/* next discard position */

	atomic_t issued_discard;		/* # of issued discard */

	atomic_t issing_discard;		/* # of issing discard */

	atomic_t queued_discard;		/* # of queued discard */

	atomic_t discard_cmd_cnt;		/* # of cached cmd count */

	struct rb_root_cached root;		/* root of discard rb-tree */

	bool rbtree_check;			/* config for consistence check */
@@ -893,7 +893,7 @@ struct flush_cmd_control { 
	struct task_struct *f2fs_issue_flush;	/* flush thread */

	wait_queue_head_t flush_wait_queue;	/* waiting queue for wake-up */

	atomic_t issued_flush;			/* # of issued flushes */

	atomic_t issing_flush;			/* # of issing flushes */

	atomic_t queued_flush;			/* # of queued flushes */

	struct llist_head issue_list;		/* list for command issue */

	struct llist_node *dispatch_list;	/* list for command dispatch */

};
@@ -2167,8 +2167,8 @@ static inline bool is_idle(struct f2fs_sb_info *sbi, int type) 
		get_pages(sbi, F2FS_WB_CP_DATA) ||

		get_pages(sbi, F2FS_DIO_READ) ||

		get_pages(sbi, F2FS_DIO_WRITE) ||

		atomic_read(&SM_I(sbi)->dcc_info->issing_discard) ||

		atomic_read(&SM_I(sbi)->fcc_info->issing_flush))

		atomic_read(&SM_I(sbi)->dcc_info->queued_discard) ||

		atomic_read(&SM_I(sbi)->fcc_info->queued_flush))

		return false;

	return f2fs_time_over(sbi, type);

}

fs/f2fs/segment.c

+13 −13
Original line number Diff line number Diff line
@@ -621,16 +621,16 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino) 
		return 0;



	if (!test_opt(sbi, FLUSH_MERGE)) {

		atomic_inc(&fcc->issing_flush);

		atomic_inc(&fcc->queued_flush);

		ret = submit_flush_wait(sbi, ino);

		atomic_dec(&fcc->issing_flush);

		atomic_dec(&fcc->queued_flush);

		atomic_inc(&fcc->issued_flush);

		return ret;

	}



	if (atomic_inc_return(&fcc->issing_flush) == 1 || sbi->s_ndevs > 1) {

	if (atomic_inc_return(&fcc->queued_flush) == 1 || sbi->s_ndevs > 1) {

		ret = submit_flush_wait(sbi, ino);

		atomic_dec(&fcc->issing_flush);

		atomic_dec(&fcc->queued_flush);



		atomic_inc(&fcc->issued_flush);

		return ret;
@@ -649,14 +649,14 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino) 


	if (fcc->f2fs_issue_flush) {

		wait_for_completion(&cmd.wait);

		atomic_dec(&fcc->issing_flush);

		atomic_dec(&fcc->queued_flush);

	} else {

		struct llist_node *list;



		list = llist_del_all(&fcc->issue_list);

		if (!list) {

			wait_for_completion(&cmd.wait);

			atomic_dec(&fcc->issing_flush);

			atomic_dec(&fcc->queued_flush);

		} else {

			struct flush_cmd *tmp, *next;
@@ -665,7 +665,7 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino) 
			llist_for_each_entry_safe(tmp, next, list, llnode) {

				if (tmp == &cmd) {

					cmd.ret = ret;

					atomic_dec(&fcc->issing_flush);

					atomic_dec(&fcc->queued_flush);

					continue;

				}

				tmp->ret = ret;
@@ -694,7 +694,7 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi) 
	if (!fcc)

		return -ENOMEM;

	atomic_set(&fcc->issued_flush, 0);

	atomic_set(&fcc->issing_flush, 0);

	atomic_set(&fcc->queued_flush, 0);

	init_waitqueue_head(&fcc->flush_wait_queue);

	init_llist_head(&fcc->issue_list);

	SM_I(sbi)->fcc_info = fcc;
@@ -910,7 +910,7 @@ static struct discard_cmd *__create_discard_cmd(struct f2fs_sb_info *sbi, 
	dc->len = len;

	dc->ref = 0;

	dc->state = D_PREP;

	dc->issuing = 0;

	dc->queued = 0;

	dc->error = 0;

	init_completion(&dc->wait);

	list_add_tail(&dc->list, pend_list);
@@ -943,7 +943,7 @@ static void __detach_discard_cmd(struct discard_cmd_control *dcc, 
							struct discard_cmd *dc)

{

	if (dc->state == D_DONE)

		atomic_sub(dc->issuing, &dcc->issing_discard);

		atomic_sub(dc->queued, &dcc->queued_discard);



	list_del(&dc->list);

	rb_erase_cached(&dc->rb_node, &dcc->root);
@@ -1146,8 +1146,8 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, 
		dc->bio_ref++;

		spin_unlock_irqrestore(&dc->lock, flags);



		atomic_inc(&dcc->issing_discard);

		dc->issuing++;

		atomic_inc(&dcc->queued_discard);

		dc->queued++;

		list_move_tail(&dc->list, wait_list);



		/* sanity check on discard range */
@@ -1997,7 +1997,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi) 
	INIT_LIST_HEAD(&dcc->fstrim_list);

	mutex_init(&dcc->cmd_lock);

	atomic_set(&dcc->issued_discard, 0);

	atomic_set(&dcc->issing_discard, 0);

	atomic_set(&dcc->queued_discard, 0);

	atomic_set(&dcc->discard_cmd_cnt, 0);

	dcc->nr_discards = 0;

	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;