lightnvm: fix some WARN() messages
Subsystems (2)
PATCH 1/1 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 Dan Carpenter <[email protected]>
drivers/lightnvm/pblk-read.c +6 -6
@@ -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-write.c +1 -1
@@ -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; }
drivers/lightnvm/pblk-recovery.c +1 -1
@@ -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);
Quoted 61 lines · Dan Carpenter
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 <[email protected]>drivers/lightnvm/pblk-read.c +6
-6@@ -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-write.c +1
-1@@ -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; }drivers/lightnvm/pblk-recovery.c +0
-0
drivers/lightnvm/pblk-recovery.c static int pblk_recov_l2p_from_emeta(struct pblk *pblk, struct pblk_line *line) · line 173
Quoted 8 lines
drivers/lightnvm/pblk-recovery.c +1
-1@@ -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);
Hehe, yep. That was slightly misused. Thanks for pointing it out. I've applied it for 4.12.