| Message ID | 1572530719-32161-1-git-send-email-cai@lca.pw (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 4e24e37d5313edca8b4ab86f240c046c731e28d6 |
| Headers | show |
| Series | [v3] nvdimm/btt: fix variable 'rc' set but not used | expand |
On Thu, 2019-10-31 at 10:05 -0400, Qian Cai wrote: > drivers/nvdimm/btt.c: In function 'btt_read_pg': > drivers/nvdimm/btt.c:1264:8: warning: variable 'rc' set but not used > [-Wunused-but-set-variable] > int rc; > ^~ > > Add a ratelimited message in case a storm of errors is encountered. > > Fixes: d9b83c756953 ("libnvdimm, btt: rework error clearing") > Signed-off-by: Qian Cai <cai@lca.pw> > --- > v3: remove the unused "rc" per Vishal. > v2: include the block address that is returning an error per Dan. > > drivers/nvdimm/btt.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Looks good, Reviewed-by: Vishal Verma <vishal.l.verma@intel.com> > > diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c > index 3e9f45aec8d1..5129543a0473 100644 > --- a/drivers/nvdimm/btt.c > +++ b/drivers/nvdimm/btt.c > @@ -1261,11 +1261,11 @@ static int btt_read_pg(struct btt *btt, struct bio_integrity_payload *bip, > > ret = btt_data_read(arena, page, off, postmap, cur_len); > if (ret) { > - int rc; > - > /* Media error - set the e_flag */ > - rc = btt_map_write(arena, premap, postmap, 0, 1, > - NVDIMM_IO_ATOMIC); > + if (btt_map_write(arena, premap, postmap, 0, 1, NVDIMM_IO_ATOMIC)) > + dev_warn_ratelimited(to_dev(arena), > + "Error persistently tracking bad blocks at %#x\n", > + premap); > goto out_rtt; > } >
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c index 3e9f45aec8d1..5129543a0473 100644 --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c @@ -1261,11 +1261,11 @@ static int btt_read_pg(struct btt *btt, struct bio_integrity_payload *bip, ret = btt_data_read(arena, page, off, postmap, cur_len); if (ret) { - int rc; - /* Media error - set the e_flag */ - rc = btt_map_write(arena, premap, postmap, 0, 1, - NVDIMM_IO_ATOMIC); + if (btt_map_write(arena, premap, postmap, 0, 1, NVDIMM_IO_ATOMIC)) + dev_warn_ratelimited(to_dev(arena), + "Error persistently tracking bad blocks at %#x\n", + premap); goto out_rtt; }
drivers/nvdimm/btt.c: In function 'btt_read_pg': drivers/nvdimm/btt.c:1264:8: warning: variable 'rc' set but not used [-Wunused-but-set-variable] int rc; ^~ Add a ratelimited message in case a storm of errors is encountered. Fixes: d9b83c756953 ("libnvdimm, btt: rework error clearing") Signed-off-by: Qian Cai <cai@lca.pw> --- v3: remove the unused "rc" per Vishal. v2: include the block address that is returning an error per Dan. drivers/nvdimm/btt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)