From: "Matias Bjørling" <matias@cnexlabs.com>
To: <axboe@fb.com>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
"Dan Carpenter" <dan.carpenter@oracle.com>,
"Matias Bjørling" <matias@cnexlabs.com>
Subject: [GIT PULL 18/19] lightnvm: fix some WARN() messages
Date: Sat, 15 Apr 2017 20:55:52 +0200 [thread overview]
Message-ID: <20170415185553.16098-19-matias@cnexlabs.com> (raw)
In-Reply-To: <20170415185553.16098-1-matias@cnexlabs.com>
From: Dan Carpenter <dan.carpenter@oracle.com>
WARN_ON() takes a condition, not an error message. I slightly tweaked
some conditions so hopefully it's more clear.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
---
drivers/lightnvm/pblk-read.c | 12 ++++++------
drivers/lightnvm/pblk-recovery.c | 2 +-
drivers/lightnvm/pblk-write.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c
index eff0982..bce7ed5 100644
--- a/drivers/lightnvm/pblk-read.c
+++ b/drivers/lightnvm/pblk-read.c
@@ -49,8 +49,8 @@ static void pblk_read_ppalist_rq(struct pblk *pblk, struct nvm_rq *rqd,
int i, j = 0;
/* logic error: lba out-of-bounds. Ignore read request */
- if (!(blba + nr_secs < pblk->rl.nr_secs)) {
- WARN_ON("pblk: read lbas out of bounds\n");
+ if (blba + nr_secs >= pblk->rl.nr_secs) {
+ WARN(1, "pblk: read lbas out of bounds\n");
return;
}
@@ -254,8 +254,8 @@ static void pblk_read_rq(struct pblk *pblk, struct nvm_rq *rqd,
sector_t lba = pblk_get_lba(bio);
/* logic error: lba out-of-bounds. Ignore read request */
- if (!(lba < pblk->rl.nr_secs)) {
- WARN_ON("pblk: read lba out of bounds\n");
+ if (lba >= pblk->rl.nr_secs) {
+ WARN(1, "pblk: read lba out of bounds\n");
return;
}
@@ -411,8 +411,8 @@ static int read_rq_gc(struct pblk *pblk, struct nvm_rq *rqd,
int valid_secs = 0;
/* logic error: lba out-of-bounds */
- if (!(lba < pblk->rl.nr_secs)) {
- WARN_ON("pblk: read lba out of bounds\n");
+ if (lba >= pblk->rl.nr_secs) {
+ WARN(1, "pblk: read lba out of bounds\n");
goto out;
}
diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
index 0d50f41..f8f8508 100644
--- a/drivers/lightnvm/pblk-recovery.c
+++ b/drivers/lightnvm/pblk-recovery.c
@@ -167,7 +167,7 @@ static int pblk_recov_l2p_from_emeta(struct pblk *pblk, struct pblk_line *line)
if (le64_to_cpu(lba_list[i]) == ADDR_EMPTY) {
spin_lock(&line->lock);
if (test_and_set_bit(i, line->invalid_bitmap))
- WARN_ON_ONCE("pblk: rec. double invalidate:\n");
+ WARN_ONCE(1, "pblk: rec. double invalidate:\n");
else
line->vsc--;
spin_unlock(&line->lock);
diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c
index ee57db9..74f7413 100644
--- a/drivers/lightnvm/pblk-write.c
+++ b/drivers/lightnvm/pblk-write.c
@@ -141,7 +141,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd)
/* Logic error */
if (bit > c_ctx->nr_valid) {
- WARN_ON_ONCE("pblk: corrupted write request\n");
+ WARN_ONCE(1, "pblk: corrupted write request\n");
goto out;
}
--
2.9.3
next prev parent reply other threads:[~2017-04-15 18:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-15 18:55 [GIT PULL 00/19] LightNVM patches for 4.12 Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 01/19] lightnvm: Fix error handling Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 02/19] nvme/lightnvm: Prevent small buffer overflow in nvme_nvm_identify Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 03/19] lightnvm: submit erases using the I/O path Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 04/19] lightnvm: rename scrambler controller hint Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 05/19] lightnvm: free reverse device map Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 06/19] lightnvm: enable nvme size compile asserts Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 07/19] lightnvm: don't check for failure from mempool_alloc() Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 08/19] lightnvm: double-clear of dev->lun_map on target init error Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 09/19] lightnvm: fix cleanup order of disk on " Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 10/19] lightnvm: bad type conversion for nvme control bits Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 11/19] lightnvm: allow to init targets on factory mode Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 12/19] lightnvm: make nvm_free static Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 13/19] lightnvm: clean unused variable Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 14/19] lightnvm: fix type checks on rrpc Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 15/19] lightnvm: convert sprintf into strlcpy Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 16/19] lightnvm: physical block device (pblk) target Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 17/19] lightnvm: pblk-gc: fix an error pointer dereference in init Matias Bjørling
2017-04-15 18:55 ` Matias Bjørling [this message]
2017-04-15 18:55 ` [GIT PULL 19/19] lightnvm: fix some error code in pblk-init.c Matias Bjørling
2017-04-16 20:37 ` [GIT PULL 00/19] LightNVM patches for 4.12 Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170415185553.16098-19-matias@cnexlabs.com \
--to=matias@cnexlabs.com \
--cc=axboe@fb.com \
--cc=dan.carpenter@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®