From patchwork Fri Jun 30 15:56:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9819965 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 0A768602B1 for ; Fri, 30 Jun 2017 15:59:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AA9A28680 for ; Fri, 30 Jun 2017 15:59:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F306D286B0; Fri, 30 Jun 2017 15:59:37 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable 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 7FD8E28680 for ; Fri, 30 Jun 2017 15:59:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752087AbdF3P7S (ORCPT ); Fri, 30 Jun 2017 11:59:18 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:34863 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752455AbdF3P45 (ORCPT ); Fri, 30 Jun 2017 11:56:57 -0400 Received: by mail-wm0-f45.google.com with SMTP id w126so113903697wme.0 for ; Fri, 30 Jun 2017 08:56:56 -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=UYZWHIJQ8F5fCJYV1VXjLnamEjPlFUAWItLa+vO4xVM=; b=l9W8C1cLH4082iyWnAWC1LCednAnebnyU7qFZCvlwE/1ILOj+Po2oTFPeQ7NFFL3nx NJn6RZEpg9NTPx+EBnOTTZYLPwLOxATfhb6h0oeevDdi7gMLZk+U+G0XyJMqjhke+4gI 7dD5ARboVE/IZp2Z1lFQdY3C7aobfuO5SahdqsvTUFybnz2hngpvG4rSzz/ItTHGWBp4 7tyY5/eMWhO/uahPEvIB5SUtOpj2Jw0bKtGJggtc0H4yKhoYDnDu4MbnY5+zSLgZ8b0+ 8zTW6vcrcDN6FFwAxK8ozJRjsvsxG366WOv5G5Y+5ZO4I3X1wKk85aqpNgzWIcA6dDFu 8lTg== 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=UYZWHIJQ8F5fCJYV1VXjLnamEjPlFUAWItLa+vO4xVM=; b=kHCpqdriT8AxVE0fuVZpHECIMkQmgP+mamsbRnw4NV+un4Lcv+TRehJ3JegP/utpFE fmiHSmQohBQDl/eeS3KLSoz4rQ7axLWyzBh/yk8FWZ3+ztSdm/t6Pg4KO8GSMdEhHZTP aBh1bEF3rJy0CftrDYovB4Wo/FIX1a9YvLr19IpDl11aBEf6a2TBP8yOXuE/j6oVRBED XBxu1YxBBUWxlmeMdNmZRd9Ho+ydqyRUtj2deL4twf3UrFpaDNAOv9JNBTdiPCfdug7R PfhxQCFpOfOpBy+AcCGrSKZa8cGI3EWdEQrwnUOwlQNAREGxvu7gyqb75CwsBSfWvbJ9 ON1A== X-Gm-Message-State: AKS2vOw1BclnCKvtxNx91mndD1NYf4OWm5s2sEnKLN5kPeMbeV2atonm sKNX0sSdMC0plcTr X-Received: by 10.80.218.135 with SMTP id q7mr5936157edj.85.1498838215903; Fri, 30 Jun 2017 08:56:55 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id d36sm2705988edb.63.2017.06.30.08.56.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Jun 2017 08:56:55 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io, axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 05/10] lightnvm: pblk: use right metadata buffer for recovery Date: Fri, 30 Jun 2017 17:56:38 +0200 Message-Id: <1498838203-21539-6-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498838203-21539-1-git-send-email-javier@cnexlabs.com> References: <1498838203-21539-1-git-send-email-javier@cnexlabs.com> 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 Fix bad metadata buffer assignations introduced when refactoring the medatada write path. Fixes: dd2a43437337 lightnvm: pblk: sched. metadata on write thread Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-recovery.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c index 7e1c314f2766..6d58659fa3da 100644 --- a/drivers/lightnvm/pblk-recovery.c +++ b/drivers/lightnvm/pblk-recovery.c @@ -801,7 +801,7 @@ struct pblk_line *pblk_recov_l2p(struct pblk *pblk) set_bit(meta_line, &l_mg->meta_bitmap); smeta = l_mg->sline_meta[meta_line]; emeta = l_mg->eline_meta[meta_line]; - smeta_buf = smeta->buf; + smeta_buf = (struct line_smeta *)smeta; spin_unlock(&l_mg->free_lock); /* Order data lines using their sequence number */ @@ -888,9 +888,9 @@ struct pblk_line *pblk_recov_l2p(struct pblk *pblk) nr_bb = bitmap_weight(line->blk_bitmap, lm->blk_per_line); off -= nr_bb * geo->sec_per_pl; - memset(&emeta->buf, 0, lm->emeta_len[0]); - line->emeta = emeta; line->emeta_ssec = off; + line->emeta = emeta; + memset(line->emeta->buf, 0, lm->emeta_len[0]); if (pblk_line_read_emeta(pblk, line, line->emeta->buf)) { pblk_recov_l2p_from_oob(pblk, line);