From patchwork Mon May 28 08:58:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 10430171 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 A852B60249 for ; Mon, 28 May 2018 09:05:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99B2C28BE1 for ; Mon, 28 May 2018 09:05:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E53928BE5; Mon, 28 May 2018 09:05:26 +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 1186A28BE1 for ; Mon, 28 May 2018 09:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754120AbeE1JFW (ORCPT ); Mon, 28 May 2018 05:05:22 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:54357 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754185AbeE1I67 (ORCPT ); Mon, 28 May 2018 04:58:59 -0400 Received: by mail-wm0-f67.google.com with SMTP id f6-v6so30152809wmc.4 for ; Mon, 28 May 2018 01:58:58 -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=RAND20TqlvgYnC1copOaNB/mfJCdREcZw/ohEKeFjpA=; b=vDomoE2lD6YiblcmzKsrLPtLeo898XRMR++6sY17H9eQte2gESdGA1nGIftMTElTJK pomk+5MsOEDx+zvkJlSQp+TA4b0hiST3znrWwxn8k6g0tDgzX3I+X3GX610cFlYYhCUc irXDbWa8+Q+SKFPVKqmBgCjs09YBYWVLJXwkkeYy3ztMB5CfJLGZ1JYFIJ4f24XZikZT /3b+usY9wr7opA1oEfCEjqXvb5vn8rXs3oOtu0MWXOKMLqRthhxlZywE8Y+R+y782XtB PuLLZgLCUFnYrvmyKKIemFBYfAqkvwvNYeNXOH5NThyt7pD5KOZKDbyBuUt1PtfjAaN6 vE2g== 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=RAND20TqlvgYnC1copOaNB/mfJCdREcZw/ohEKeFjpA=; b=LIO0Ap/sHfkX89sPB0z0D768UN5VOlZOYLBLaEB+S+xMZSPGDVLMYBEmZlUSoTlT2h We8FlB6oOJv0GGjcI6NCCFMi/px53n9yHbfzhDg9rbwnJccVcIF3Xqb9mqL503303JJu sPDk8MMwcX6VgeQBRZwiQI+9PoAtLusTK8/LrYtAF9f0kGQwnw/FVu89mQ3mYZrK660+ E72vpM3IvVc4MMTpRgyLH6GnHxnxCg6f8h85KnGkJwqsBKTNbRG7Bj5TBGlYqNw0sqep cPr6jnb0w/2iZ5S0wnOtDouZgNstWLNqjRs1jwzRScX7KMfqRuGDB8Z5UyNIrPNUhtxy 59xA== X-Gm-Message-State: ALKqPwfh6NKCMudKAi/R8l664wgvn9tR15PMrfMag0c9QCqHwfv9aIqx ywFksffpsByumxcW04pjjEiwyHvp X-Google-Smtp-Source: AB8JxZrgSJFVbG1rZpMvhNqUvT45C7NnVlo9xCdmfNxCAnOObuDPrGRGZW1hcDU2CpxXWetv2nhT4g== X-Received: by 2002:a2e:5d57:: with SMTP id r84-v6mr7829886ljb.125.1527497938360; Mon, 28 May 2018 01:58:58 -0700 (PDT) Received: from Macroninja.cnexlabs.com (95-166-82-66-cable.dk.customer.tdc.net. [95.166.82.66]) by smtp.gmail.com with ESMTPSA id u2-v6sm5777848lji.4.2018.05.28.01.58.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 01:58:57 -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, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [GIT PULL 07/20] lightnvm: pblk: remove unnecessary indirection Date: Mon, 28 May 2018 10:58:28 +0200 Message-Id: <20180528085841.26684-8-mb@lightnvm.io> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180528085841.26684-1-mb@lightnvm.io> References: <20180528085841.26684-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 From: Javier González Call nvm_submit_io directly and remove an unnecessary indirection on the read path. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- 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;