From patchwork Mon Apr 30 09:10:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Javier_Gonz=C3=A1lez?= X-Patchwork-Id: 10371171 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 810926032A for ; Mon, 30 Apr 2018 09:12:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 734B8289A6 for ; Mon, 30 Apr 2018 09:12:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68503289AB; Mon, 30 Apr 2018 09:12:19 +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=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 090F6289A6 for ; Mon, 30 Apr 2018 09:12:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753127AbeD3JME (ORCPT ); Mon, 30 Apr 2018 05:12:04 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:51366 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753189AbeD3JKX (ORCPT ); Mon, 30 Apr 2018 05:10:23 -0400 Received: by mail-wm0-f67.google.com with SMTP id j4so11905209wme.1 for ; Mon, 30 Apr 2018 02:10:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javigon-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5OAQpfUgiQ1kp4yOTfgKyHpS8eznwzYX6DZhu4bTQfE=; b=uGWz/iOKhLy6KOJu2yG4ggqS1P3t2GrRgQi7b07XYjx6GEPUO34l2/SmYEQHqxWTVc YHQjRckuYfuLdwf6/a0ohSedaiDNw7X3H528ZuXO+zFRdom1EbwBYkhoCQER3D7ukUkA TZkPKoDENDL0OcFM4rVWh4ax6MNLmSwYyBwzWcpewROPsgpJddlVNLfv26NK2eaSPu65 Rn2+5rVofzPeoIpTtqPxyBkrXJz8G6FT6aPugvSc6kFKNiz5bPgW/HaTC+i4Zgz3wAnB ICSIU1Ftdp9Btn5CGk5vy4nkKTIdhaVV1slbQ9CjUVwKJDN/tfcafgSaAikSEXjPBBKd qvmA== 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=5OAQpfUgiQ1kp4yOTfgKyHpS8eznwzYX6DZhu4bTQfE=; b=taCVKMxV/pBy5ORqfuQXZDpBkdFKoyp0iJcJXXNkV9ClvlMYiVIRm6HiXzAo6nsoDZ 7QiNBP3LfRbxoFV8IyFCJnnX/nuZLwInVuskTuoewjFTmV2PwB7dgotKh8qhlkn2WOfi Cl1srzM4WsTBHJVB09Y6BwLXJZZslu4lBcuTm+NkLkEOPSpJrShEi9AqEzMnz9gkM113 kivONMIQVIValv0ay3YIlbQN44jyeUMzjlTjrzfcNvpetuLwYyOxxFfyYhtosaGWebnC E6Qc7Tj6eiqJTS4dHuK4eMf6d/IZausxAqPJrpcsSlj8dYNmX9uU/xbGJDqpu7dIGK+d gPXg== X-Gm-Message-State: ALQs6tDtpwtQEiXyXnIC0ZpLI7pMajKDl9v5/mqgP/dcTCZUUtTj9TiD sqpjEui89NJ4mLF7j/KVF7s2FQ== X-Google-Smtp-Source: AB8JxZpI2Pe72dLRn6/M85hU3e4jSfoWyAm8lEkw4/vBt+pW+uU/9zq9y9GN7MYWGUMkxzJ2z03NDw== X-Received: by 2002:a50:af64:: with SMTP id g91-v6mr15980459edd.57.1525079422626; Mon, 30 Apr 2018 02:10:22 -0700 (PDT) Received: from uhalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id b56-v6sm2108638edd.85.2018.04.30.02.10.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Apr 2018 02:10:22 -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 Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 07/11] lightnvm: pblk: remove unnecessary indirection Date: Mon, 30 Apr 2018 11:10:05 +0200 Message-Id: <1525079409-6588-8-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525079409-6588-1-git-send-email-javier@cnexlabs.com> References: <1525079409-6588-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 Call nvm_submit_io directly and remove an unnecessary indirection on the read path. Signed-off-by: Javier González --- drivers/lightnvm/pblk-read.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c index b201fc486adb..a2e678de428f 100644 --- a/drivers/lightnvm/pblk-read.c +++ b/drivers/lightnvm/pblk-read.c @@ -102,16 +102,6 @@ static void pblk_read_ppalist_rq(struct pblk *pblk, struct nvm_rq *rqd, #endif } -static int pblk_submit_read_io(struct pblk *pblk, struct nvm_rq *rqd) -{ - int err; - - err = pblk_submit_io(pblk, rqd); - if (err) - return NVM_IO_ERR; - - return NVM_IO_OK; -} static void pblk_read_check_seq(struct pblk *pblk, struct nvm_rq *rqd, sector_t blba) @@ -485,9 +475,9 @@ int pblk_submit_read(struct pblk *pblk, struct bio *bio) rqd->bio = int_bio; r_ctx->private = bio; - ret = pblk_submit_read_io(pblk, rqd); - if (ret) { + if (pblk_submit_io(pblk, rqd)) { pr_err("pblk: read IO submission failed\n"); + ret = NVM_IO_ERR; if (int_bio) bio_put(int_bio); goto fail_end_io;