From patchwork Fri Jun 30 15:56:34 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: 9819901 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 E919B602B1 for ; Fri, 30 Jun 2017 15:57:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 573C12853B for ; Fri, 30 Jun 2017 15:57:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C192286B0; Fri, 30 Jun 2017 15:57:03 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 D77762853B for ; Fri, 30 Jun 2017 15:57:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751668AbdF3P5A (ORCPT ); Fri, 30 Jun 2017 11:57:00 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36845 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752457AbdF3P46 (ORCPT ); Fri, 30 Jun 2017 11:56:58 -0400 Received: by mail-wm0-f49.google.com with SMTP id 62so114233390wmw.1 for ; Fri, 30 Jun 2017 08:56:52 -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=3/3oD9/cRNXdZHlObeIIwxE4InAzrD4QF7Edx0sJJMA=; b=twbjB7/WmTgmWBFROQZ5pf3bPT1ZQYxW0ZuL5SaW4rDmiFzqYVV723dhgE8EId9tb3 CT9lolxN2IHftY+UupKNlNpCmiYbzroCUrtlI5nwW9FLoQtPOppTGCHNfIMtken/J/pY sRKDr3Q+nZAahK+UXknoq9JwtqMOlyN2dJf9KevGsyXRAIBG7r8Ct1HnQ55eAmsfI0aM lergNfcQz09HFCeMImJWWBdOu5DPH/VcYmZSh3gCu+BBJtf5iLQ33WaOjSQ7uVxJInkX Hjw/9P9FYA2dsHrslHg9hTw4atLFXxgj2LSSNp9DoJmK3ya7TFfJRYWw49FUTA3B8oCP eBtA== 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=3/3oD9/cRNXdZHlObeIIwxE4InAzrD4QF7Edx0sJJMA=; b=aS66tnpAdlghH+t6kJ5CMl4Q4bcMmYAg6AjIxVYkJgDviSBVOfv08wwKMGWqHhqz6d R2AjM0Ro8KbFNs0lM11KlBwqjijOPeft5Rk9AZbor8zFi7PRde9IfS1w3ed+vAWuuIVD pTZ09Pxjij0d13XelshMN348TfmE84awPKG5jqnwTdz+cUHtN+5mYhnns8KXizarqOBA WbDAWvNjdW2dA2h5kVmPLCh/eeTyxIILiSBogUas1XgevHbxUEMuCSPftz9H8iEFAWaX oUyl0mdLJ9dzXG/q90wBoX5P+4WUHH6lDEIvIx300ub7szfp/T8VDInzewB3TUs3AuiS rMfA== X-Gm-Message-State: AKS2vOxYLK4Ve3ngoRJowsHbuxX1Z9XQInq6gHnbZ3SR04dv5OW6iKs7 EnQWAvpnR5ELmfzt X-Received: by 10.80.149.209 with SMTP id x17mr5773897eda.175.1498838211617; Fri, 30 Jun 2017 08:56:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Jun 2017 08:56:50 -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 01/10] lightnvm: pblk: fix bad le64 assignations Date: Fri, 30 Jun 2017 17:56:34 +0200 Message-Id: <1498838203-21539-2-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 Use the right types and conversions on le64 variables. Reported by sparse. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 2 +- drivers/lightnvm/pblk-gc.c | 5 ++++- drivers/lightnvm/pblk-map.c | 2 +- drivers/lightnvm/pblk-recovery.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index 7648186bd1b1..a654b34f6f86 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -765,7 +765,7 @@ static int pblk_line_submit_smeta_io(struct pblk *pblk, struct pblk_line *line, rqd.ppa_list[i] = addr_to_gen_ppa(pblk, paddr, line->id); if (dir == WRITE) { - u64 addr_empty = cpu_to_le64(ADDR_EMPTY); + __le64 addr_empty = cpu_to_le64(ADDR_EMPTY); meta_list[i].lba = lba_list[paddr] = addr_empty; } diff --git a/drivers/lightnvm/pblk-gc.c b/drivers/lightnvm/pblk-gc.c index 1d289242ab92..9b4059b93855 100644 --- a/drivers/lightnvm/pblk-gc.c +++ b/drivers/lightnvm/pblk-gc.c @@ -314,10 +314,13 @@ static struct pblk_line *pblk_gc_get_victim_line(struct pblk *pblk, struct list_head *group_list) { struct pblk_line *line, *victim; + int line_vsc, victim_vsc; victim = list_first_entry(group_list, struct pblk_line, list); list_for_each_entry(line, group_list, list) { - if (*line->vsc < *victim->vsc) + line_vsc = le32_to_cpu(*line->vsc); + victim_vsc = le32_to_cpu(*victim->vsc); + if (line_vsc < victim_vsc) victim = line; } diff --git a/drivers/lightnvm/pblk-map.c b/drivers/lightnvm/pblk-map.c index a9be03cd07a8..fddb924f6dde 100644 --- a/drivers/lightnvm/pblk-map.c +++ b/drivers/lightnvm/pblk-map.c @@ -53,7 +53,7 @@ static void pblk_map_page_data(struct pblk *pblk, unsigned int sentry, lba_list[paddr] = cpu_to_le64(w_ctx->lba); line->nr_valid_lbas++; } else { - u64 addr_empty = cpu_to_le64(ADDR_EMPTY); + __le64 addr_empty = cpu_to_le64(ADDR_EMPTY); lba_list[paddr] = meta_list[i].lba = addr_empty; __pblk_map_invalidate(pblk, line, paddr); diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c index abf36f587477..7e1c314f2766 100644 --- a/drivers/lightnvm/pblk-recovery.c +++ b/drivers/lightnvm/pblk-recovery.c @@ -395,7 +395,7 @@ static int pblk_recov_pad_oob(struct pblk *pblk, struct pblk_line *line, for (j = 0; j < pblk->min_write_pgs; j++, i++, w_ptr++) { struct ppa_addr dev_ppa; - u64 addr_empty = cpu_to_le64(ADDR_EMPTY); + __le64 addr_empty = cpu_to_le64(ADDR_EMPTY); dev_ppa = addr_to_gen_ppa(pblk, w_ptr, line->id);