Commit 2a79efd8 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jens Axboe
Browse files

lightnvm: fix some WARN() messages 



WARN_ON() takes a condition, not an error message.  I slightly tweaked
some conditions so hopefully it's more clear.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 503ec94e

drivers/lightnvm/pblk-read.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

	}

drivers/lightnvm/pblk-recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/lightnvm/pblk-write.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE