From patchwork Fri Jul 13 08:48:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 10522809 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C9A16028E for ; Fri, 13 Jul 2018 08:49:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E7B329963 for ; Fri, 13 Jul 2018 08:49:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22E7A29A87; Fri, 13 Jul 2018 08:49:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC47929A6E for ; Fri, 13 Jul 2018 08:49:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729691AbeGMJDB (ORCPT ); Fri, 13 Jul 2018 05:03:01 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:41350 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729676AbeGMJDB (ORCPT ); Fri, 13 Jul 2018 05:03:01 -0400 Received: by mail-pl0-f65.google.com with SMTP id w8-v6so11931371ply.8 for ; Fri, 13 Jul 2018 01:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KN9SV33FLnLJMA92S3MlUtZGomr1Mwe/OGsIBK+qvvw=; b=ayh6ECaZD7T1Cs9NjZRarJSfbIqpJKx6fgbjSxVnnGqZar5tJVNTVhmyUlmjZgW1eo qF7NfExZHvzGvSTex782yYVRyeeJf6WCzxqSlJe8nJRreJsAecVPb4GvflyKYNtm22Ji N+OryVfVx6HwZ9ofQQ4aqnh0fqMgEDcDsO5q/fRF/Lt7nFUvYlsHd6bO1ssaJJwOJV1Z kV7za70n5Mg1h7S0yCnZWFDSD9yN/gyGwUQtJ4MhgETv1wD4Q2C3HAfe6woY7GX0RXQk GNLk62EhvYQIZJp7lV0eygRkX24DczSxd5pOxWwuU7UGOWoNylV0Ylnq92RF3qYJzH6M nUCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KN9SV33FLnLJMA92S3MlUtZGomr1Mwe/OGsIBK+qvvw=; b=Yrm0fR/I8n6TvX/H5RQw0w2e+p91CkYC2eCZmVo83VO06SlVbYimGfI/XaGwzq59LG US/vM1Jpt5XCqsDoHxVs6emw5B4kH2cIgigBs2EWb2QKVCSwmsQxdvDEH/sWH8ysc/OC OC/J4TlY5Xvnwpeb5bkz7ZJW3alEGjJ4zYzlutnYs9PZ+CtO8OD6ULvY8lGWMEFHvd3O 4paIRcnAXz80ek5+u5XIggMuI+4mUC3Osl5NFxNdP+eR3MQVVYlaCvW5XozUBZ7vl0yx A27i4WqSSo2dwr6ItQiBr2ajsGDRIAP3vaQMCtC2LXxKGFS5Eux65soAmKPa19jOfpPe RsAg== X-Gm-Message-State: AOUpUlEymTfRXtjRmILhlOb2gqeM6P3BkdwG1hcuNZ/o2PxqiQ330amC ZfoBK6dbIOTGAqiM9Yk5Tr4fiA== X-Google-Smtp-Source: AAOMgpcJlWpdORsFYv25t/N9PVpWHskYJA1WeO98q/3PV3A2Vi6S/VtKIwka/ctfQe5PsNUeklk1wg== X-Received: by 2002:a17:902:8207:: with SMTP id x7-v6mr5419201pln.57.1531471761147; Fri, 13 Jul 2018 01:49:21 -0700 (PDT) Received: from skyninja.hgst.com (rap-us.hgst.com. [199.255.44.250]) by smtp.gmail.com with ESMTPSA id d18-v6sm569357pgo.74.2018.07.13.01.49.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:49:19 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, bart.vanassche@wdc.com, hans.holmberg@cnexlabs.com, javier@cnexlabs.com, hlitz@ucsc.edu, igor.j.konopko@intel.com, marcin.dziegielewski@intel.com, =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [GIT PULL 03/10] lightnvm: pblk: enable line minor version detection Date: Fri, 13 Jul 2018 10:48:38 +0200 Message-Id: <20180713084845.19511-4-mb@lightnvm.io> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180713084845.19511-1-mb@lightnvm.io> References: <20180713084845.19511-1-mb@lightnvm.io> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When recovering a line, an extra check was added when debugging was active, such that minor version where also checked. Unfortunately, this used the ifdef NVM_DEBUG, which is not correct. Instead use the proper DEBUG def, and now that it compiles, also fix the variable. Signed-off-by: Matias Bjørling Fixes: d0ab0b1ab991f ("lightnvm: pblk: check data lines version on recovery") Reviewed-by: Javier González --- drivers/lightnvm/pblk-recovery.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c index 3a5069183859..d83466b3821b 100644 --- a/drivers/lightnvm/pblk-recovery.c +++ b/drivers/lightnvm/pblk-recovery.c @@ -742,9 +742,10 @@ static int pblk_recov_check_line_version(struct pblk *pblk, return 1; } -#ifdef NVM_DEBUG +#ifdef CONFIG_NVM_PBLK_DEBUG if (header->version_minor > EMETA_VERSION_MINOR) - pr_info("pblk: newer line minor version found: %d\n", line_v); + pr_info("pblk: newer line minor version found: %d\n", + header->version_minor); #endif return 0;