OSDN Git Service

libnvdimm/btt: fix variable 'rc' set but not used
authorQian Cai <cai@lca.pw>
Thu, 31 Oct 2019 14:05:19 +0000 (10:05 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 4 Jan 2020 18:13:00 +0000 (19:13 +0100)
[ Upstream commit 4e24e37d5313edca8b4ab86f240c046c731e28d6 ]

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>
Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
Link: https://lore.kernel.org/r/1572530719-32161-1-git-send-email-cai@lca.pw
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nvdimm/btt.c

index 0360c01..75ae2c5 100644 (file)
@@ -1260,11 +1260,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;
                }