Commit 72691af6 authored by Jaegeuk Kim's avatar Jaegeuk Kim

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 5222595d
...@@ -64,7 +64,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) ...@@ -64,7 +64,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
si->nr_flushed = si->nr_flushed =
atomic_read(&SM_I(sbi)->fcc_info->issued_flush); atomic_read(&SM_I(sbi)->fcc_info->issued_flush);
si->nr_flushing = 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 = si->flush_list_empty =
llist_empty(&SM_I(sbi)->fcc_info->issue_list); llist_empty(&SM_I(sbi)->fcc_info->issue_list);
} }
...@@ -72,7 +72,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) ...@@ -72,7 +72,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
si->nr_discarded = si->nr_discarded =
atomic_read(&SM_I(sbi)->dcc_info->issued_discard); atomic_read(&SM_I(sbi)->dcc_info->issued_discard);
si->nr_discarding = 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 = si->nr_discard_cmd =
atomic_read(&SM_I(sbi)->dcc_info->discard_cmd_cnt); atomic_read(&SM_I(sbi)->dcc_info->discard_cmd_cnt);
si->undiscard_blks = SM_I(sbi)->dcc_info->undiscard_blks; si->undiscard_blks = SM_I(sbi)->dcc_info->undiscard_blks;
......
...@@ -285,7 +285,7 @@ struct discard_cmd { ...@@ -285,7 +285,7 @@ struct discard_cmd {
struct block_device *bdev; /* bdev */ struct block_device *bdev; /* bdev */
unsigned short ref; /* reference count */ unsigned short ref; /* reference count */
unsigned char state; /* state */ unsigned char state; /* state */
unsigned char issuing; /* issuing discard */ unsigned char queued; /* queued discard */
int error; /* bio error */ int error; /* bio error */
spinlock_t lock; /* for state/bio_ref updating */ spinlock_t lock; /* for state/bio_ref updating */
unsigned short bio_ref; /* bio reference count */ unsigned short bio_ref; /* bio reference count */
...@@ -327,7 +327,7 @@ struct discard_cmd_control { ...@@ -327,7 +327,7 @@ struct discard_cmd_control {
unsigned int undiscard_blks; /* # of undiscard blocks */ unsigned int undiscard_blks; /* # of undiscard blocks */
unsigned int next_pos; /* next discard position */ unsigned int next_pos; /* next discard position */
atomic_t issued_discard; /* # of issued discard */ 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 */ atomic_t discard_cmd_cnt; /* # of cached cmd count */
struct rb_root_cached root; /* root of discard rb-tree */ struct rb_root_cached root; /* root of discard rb-tree */
bool rbtree_check; /* config for consistence check */ bool rbtree_check; /* config for consistence check */
...@@ -892,7 +892,7 @@ struct flush_cmd_control { ...@@ -892,7 +892,7 @@ struct flush_cmd_control {
struct task_struct *f2fs_issue_flush; /* flush thread */ struct task_struct *f2fs_issue_flush; /* flush thread */
wait_queue_head_t flush_wait_queue; /* waiting queue for wake-up */ wait_queue_head_t flush_wait_queue; /* waiting queue for wake-up */
atomic_t issued_flush; /* # of issued flushes */ 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_head issue_list; /* list for command issue */
struct llist_node *dispatch_list; /* list for command dispatch */ struct llist_node *dispatch_list; /* list for command dispatch */
}; };
...@@ -2166,8 +2166,8 @@ static inline bool is_idle(struct f2fs_sb_info *sbi, int type) ...@@ -2166,8 +2166,8 @@ static inline bool is_idle(struct f2fs_sb_info *sbi, int type)
get_pages(sbi, F2FS_WB_CP_DATA) || get_pages(sbi, F2FS_WB_CP_DATA) ||
get_pages(sbi, F2FS_DIO_READ) || get_pages(sbi, F2FS_DIO_READ) ||
get_pages(sbi, F2FS_DIO_WRITE) || get_pages(sbi, F2FS_DIO_WRITE) ||
atomic_read(&SM_I(sbi)->dcc_info->issing_discard) || atomic_read(&SM_I(sbi)->dcc_info->queued_discard) ||
atomic_read(&SM_I(sbi)->fcc_info->issing_flush)) atomic_read(&SM_I(sbi)->fcc_info->queued_flush))
return false; return false;
return f2fs_time_over(sbi, type); return f2fs_time_over(sbi, type);
} }
......
...@@ -621,16 +621,16 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino) ...@@ -621,16 +621,16 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino)
return 0; return 0;
if (!test_opt(sbi, FLUSH_MERGE)) { if (!test_opt(sbi, FLUSH_MERGE)) {
atomic_inc(&fcc->issing_flush); atomic_inc(&fcc->queued_flush);
ret = submit_flush_wait(sbi, ino); ret = submit_flush_wait(sbi, ino);
atomic_dec(&fcc->issing_flush); atomic_dec(&fcc->queued_flush);
atomic_inc(&fcc->issued_flush); atomic_inc(&fcc->issued_flush);
return ret; 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); ret = submit_flush_wait(sbi, ino);
atomic_dec(&fcc->issing_flush); atomic_dec(&fcc->queued_flush);
atomic_inc(&fcc->issued_flush); atomic_inc(&fcc->issued_flush);
return ret; return ret;
...@@ -649,14 +649,14 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino) ...@@ -649,14 +649,14 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino)
if (fcc->f2fs_issue_flush) { if (fcc->f2fs_issue_flush) {
wait_for_completion(&cmd.wait); wait_for_completion(&cmd.wait);
atomic_dec(&fcc->issing_flush); atomic_dec(&fcc->queued_flush);
} else { } else {
struct llist_node *list; struct llist_node *list;
list = llist_del_all(&fcc->issue_list); list = llist_del_all(&fcc->issue_list);
if (!list) { if (!list) {
wait_for_completion(&cmd.wait); wait_for_completion(&cmd.wait);
atomic_dec(&fcc->issing_flush); atomic_dec(&fcc->queued_flush);
} else { } else {
struct flush_cmd *tmp, *next; struct flush_cmd *tmp, *next;
...@@ -665,7 +665,7 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino) ...@@ -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) { llist_for_each_entry_safe(tmp, next, list, llnode) {
if (tmp == &cmd) { if (tmp == &cmd) {
cmd.ret = ret; cmd.ret = ret;
atomic_dec(&fcc->issing_flush); atomic_dec(&fcc->queued_flush);
continue; continue;
} }
tmp->ret = ret; tmp->ret = ret;
...@@ -694,7 +694,7 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi) ...@@ -694,7 +694,7 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi)
if (!fcc) if (!fcc)
return -ENOMEM; return -ENOMEM;
atomic_set(&fcc->issued_flush, 0); 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_waitqueue_head(&fcc->flush_wait_queue);
init_llist_head(&fcc->issue_list); init_llist_head(&fcc->issue_list);
SM_I(sbi)->fcc_info = fcc; SM_I(sbi)->fcc_info = fcc;
...@@ -910,7 +910,7 @@ static struct discard_cmd *__create_discard_cmd(struct f2fs_sb_info *sbi, ...@@ -910,7 +910,7 @@ static struct discard_cmd *__create_discard_cmd(struct f2fs_sb_info *sbi,
dc->len = len; dc->len = len;
dc->ref = 0; dc->ref = 0;
dc->state = D_PREP; dc->state = D_PREP;
dc->issuing = 0; dc->queued = 0;
dc->error = 0; dc->error = 0;
init_completion(&dc->wait); init_completion(&dc->wait);
list_add_tail(&dc->list, pend_list); list_add_tail(&dc->list, pend_list);
...@@ -943,7 +943,7 @@ static void __detach_discard_cmd(struct discard_cmd_control *dcc, ...@@ -943,7 +943,7 @@ static void __detach_discard_cmd(struct discard_cmd_control *dcc,
struct discard_cmd *dc) struct discard_cmd *dc)
{ {
if (dc->state == D_DONE) if (dc->state == D_DONE)
atomic_sub(dc->issuing, &dcc->issing_discard); atomic_sub(dc->queued, &dcc->queued_discard);
list_del(&dc->list); list_del(&dc->list);
rb_erase_cached(&dc->rb_node, &dcc->root); rb_erase_cached(&dc->rb_node, &dcc->root);
...@@ -1146,8 +1146,8 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, ...@@ -1146,8 +1146,8 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
dc->bio_ref++; dc->bio_ref++;
spin_unlock_irqrestore(&dc->lock, flags); spin_unlock_irqrestore(&dc->lock, flags);
atomic_inc(&dcc->issing_discard); atomic_inc(&dcc->queued_discard);
dc->issuing++; dc->queued++;
list_move_tail(&dc->list, wait_list); list_move_tail(&dc->list, wait_list);
/* sanity check on discard range */ /* sanity check on discard range */
...@@ -1997,7 +1997,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi) ...@@ -1997,7 +1997,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
INIT_LIST_HEAD(&dcc->fstrim_list); INIT_LIST_HEAD(&dcc->fstrim_list);
mutex_init(&dcc->cmd_lock); mutex_init(&dcc->cmd_lock);
atomic_set(&dcc->issued_discard, 0); 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); atomic_set(&dcc->discard_cmd_cnt, 0);
dcc->nr_discards = 0; dcc->nr_discards = 0;
dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg; dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment