From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1A17C32770 for ; Thu, 2 Jan 2020 22:54:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9714620866 for ; Thu, 2 Jan 2020 22:54:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578005648; bh=sXMuB2CZO8zNQEWG2MGhBwus/l8bV2Pqvf5j3FHDyFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rwcZwmbhOR8X3/W9lJJpM50xZp4IJXWHtb2E2afdL8trDzZ7wjkuyxs6RB7MCGjxU DKQHYf5uEn8PRwAzqV6nMaRyqp0+1DXXSkwcNwmBec9P5TcvKutK3Nr0BUo/EjEaCg fUTBH9fOTXppAVpVnqsJjnWHShpk1+Oafv9uW0L8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728883AbgABWyB (ORCPT ); Thu, 2 Jan 2020 17:54:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:39864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727834AbgABWVL (ORCPT ); Thu, 2 Jan 2020 17:21:11 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 18C4C21582; Thu, 2 Jan 2020 22:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003670; bh=sXMuB2CZO8zNQEWG2MGhBwus/l8bV2Pqvf5j3FHDyFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p5VY9EtI36NMevM1T8vRWOzsyardD+AdtU9dChMGwi5Jy3MT/gXPV1e4kjiiJoOA4 rNFYqhCSaGNdfgEzcNl11MChIifiXoKYcTlny6xXo8H/r+xaPirFzHwxMrWrbHNkWP a/U4uBvG2hM+JfzypDy/QcjLSo8kD6PRbqmVnGAY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qian Cai , Vishal Verma , Dan Williams , Sasha Levin Subject: [PATCH 4.19 048/114] libnvdimm/btt: fix variable rc set but not used Date: Thu, 2 Jan 2020 23:07:00 +0100 Message-Id: <20200102220033.933129789@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220029.183913184@linuxfoundation.org> References: <20200102220029.183913184@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Qian Cai [ 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 Reviewed-by: Vishal Verma Link: https://lore.kernel.org/r/1572530719-32161-1-git-send-email-cai@lca.pw Signed-off-by: Dan Williams Signed-off-by: Sasha Levin --- drivers/nvdimm/btt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c index 0360c015f658..75ae2c508a04 100644 --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c @@ -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; } -- 2.20.1