Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1664480imu; Thu, 13 Dec 2018 21:03:15 -0800 (PST) X-Google-Smtp-Source: AFSGD/WgH0bHFPBZwIqyGRkXwzMVnMdBfggVMMI3E6KEL7/RZoWC8k1OHRJjfg4sFZ9mJDRzhR/2 X-Received: by 2002:a62:113:: with SMTP id 19mr1513607pfb.176.1544763795502; Thu, 13 Dec 2018 21:03:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544763795; cv=none; d=google.com; s=arc-20160816; b=T5s8tnoTRUsse0hlnwLM5j/Tne0v3vAmkdgWG4sTyAiMZ0GHS1LQunJ8x8RQpuZcZO WlaQbY9m2UFvsFojbTy4uwlc1+Djlapna1tA6ayNCdbU2/X23T7An6fj3x4zIgeuEQ6X JnUUH4OMsMBcbwOUDeOh67EI/mQKy10JhBheLdz3OOymCK0crV76QuPwR3DdTS9S/C2/ 2ZtbXZv/h3GkeqoEI80FZ3Yn2lOjoNi44Xvuo3FRqtGIP8S8ZE80gabbBfJvzwhswCOw tKD6yLtZ7zBjq7pple/pPmZB3bcBhT8y9LGN3+a0+uu8kQBjW2cQqSMAiT48bYuVmlUy GKkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NIrcT5/Zuh0AjwLLHXhb6OWiRT4hd5SNpI0Qx7KTFK8=; b=iwaxUDY9Z1FSNsFNIpa0Bur9qVpV4Y5vP2eKeWJ/MteeeEiBNMRajkIKwKrQSIIS9p pm4IJY9jJPyEW2hU6PpJ0dmpkIP6oq0oKdaADXY4FAQndEUTDNV5ZIUetZ1Pw58P7a0Q HpyRA1kiDckHwIpjl04zI9/rgVQ31WyKUn3BuWFt3RFdkdFCWAjoPzGzXhI39bH3OlVO i+TUMH7x/4nLOZzBrlLpW7GEkfRz7MYfJY7nAudqsQTQzXaFABm70r1eyls82SljnzJA Vc4luQ6m+EVK3rBVTU/th1Wge5tzMQsZvubPDRtaCKc2Zb8YfHr44NtBZTLT9r3K4NAV jevA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="U//6/MJH"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1si3237694pld.92.2018.12.13.21.02.59; Thu, 13 Dec 2018 21:03:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="U//6/MJH"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727232AbeLNFBk (ORCPT + 99 others); Fri, 14 Dec 2018 00:01:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:60868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726533AbeLNFBb (ORCPT ); Fri, 14 Dec 2018 00:01:31 -0500 Received: from localhost (unknown [104.132.0.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D13C220879; Fri, 14 Dec 2018 05:01:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544763689; bh=FPJtRCJoHGrVN3Z9sjCA5NX8KkyHIk3PqkGg3hA8wKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U//6/MJHAzJrxuGcoWPgz7SK0H8Z2jN+TEThPwo3ioX2GAU4kLRt03mxrjT9tX+Ej t2DorKMgLG1LpxkoflmtwjaxdUKhH/zayS0zABNS01nDDyvO/0KXw/xvb/kUFTiIGL BUVn/Q30vX4m0cd69vUtza9hJNduDn8OIHU/PUmk= From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim Subject: [PATCH 2/3] f2fs: correct wrong spelling, issing_* Date: Thu, 13 Dec 2018 21:01:26 -0800 Message-Id: <20181214050127.45025-2-jaegeuk@kernel.org> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog In-Reply-To: <20181214050127.45025-1-jaegeuk@kernel.org> References: <20181214050127.45025-1-jaegeuk@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Let's use "queued" instead of "issuing". Signed-off-by: Jaegeuk Kim --- fs/f2fs/debug.c | 4 ++-- fs/f2fs/f2fs.h | 10 +++++----- fs/f2fs/segment.c | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c index 11d4448e8e09..ebcc121920ba 100644 --- a/fs/f2fs/debug.c +++ b/fs/f2fs/debug.c @@ -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; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 81bd9a2bf22b..b634043fe14c 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -285,7 +285,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 */ @@ -327,7 +327,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 */ @@ -892,7 +892,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); } diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 98649d304a2f..49ea9009ab5a 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -620,16 +620,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; @@ -648,14 +648,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; @@ -664,7 +664,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; @@ -693,7 +693,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; @@ -909,7 +909,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); @@ -942,7 +942,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); @@ -1145,8 +1145,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 */ @@ -1996,7 +1996,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; -- 2.19.0.605.g01d371f741-goog