From patchwork Mon Oct 24 11:28:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp657226wru; Mon, 24 Oct 2022 14:20:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5hPI67ne5NjNE41Vn976qgq7T2/lyhzQ/0Br9LMnT707LCA5hR02WzLWbvNJjcO/mLvcQt X-Received: by 2002:a17:90b:4c48:b0:20d:5c55:b8a8 with SMTP id np8-20020a17090b4c4800b0020d5c55b8a8mr41365975pjb.207.1666646430950; Mon, 24 Oct 2022 14:20:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666646430; cv=none; d=google.com; s=arc-20160816; b=kriZ5el4dFOnw4k4fI+RNAc5cQp2QYZGW42koyNAo+YXd7xe8FCWm4hhAUjLspNEQ0 /FX8k2bV0AIrE1D6CoQZFKM6WjpvyOxYzYttSF1Tfvw4qiaiVOWmUcboOKSjSBK4Mcrr 9n1YUOOauIweAwuEWpqAiUSRQDipvnK8LgPgZ5uwG2u9GpP7yYysW/Gc161KCZUYPUYl ZX6Fd6NuLpCdIT7WB8XJpv0HseNZagMiHqG8wbqMRRHq1fzJB3rNe2J1EHXbE/7Nzlum wJw45ZDVTRTC4JDszfFr909BNFLZqDUYa+QTKgy4ONJhA52fP6ERlhvyAZtSyj9K6/u4 RwFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OOc+easw/YpbBvbE++wvvs+xR8Doh9uyy+7JitDaMfw=; b=eu91lH7DW7Hq/k9s+IiO1cud9wnrKFooNvRqyEO4V976DJ9UjIMhe20fkQC9AfQ0wY woSNXxYeCB2jXngMCAfCTuj/RWLdTuv1vz0yTt+1jE6rvtqTSGsq2svXuXlfJvlVqto0 BYam7PVeDAEV27oRtzUNXTOxVOaAKvBYPvVU1pyinadvAEHKtn78eJ8m6IL5tw3t1tp2 Q8XYvWw32g18s57Y4xutpLg2Cl+KStzKdduwq5k2EbSYN5hEuXiUJNTcHIuwzM06wWdP RXl8UDqRcSC6gws5brBWdetF8d/dsfDKMKamvVk88PYp3WqRH2R7CFddy+HWzmqyv/Ts w/AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2hsT4EGm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pf14-20020a17090b1d8e00b00212de1542cesi1200598pjb.92.2022.10.24.14.20.17; Mon, 24 Oct 2022 14:20:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2hsT4EGm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231869AbiJXVQD (ORCPT + 99 others); Mon, 24 Oct 2022 17:16:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232812AbiJXVPl (ORCPT ); Mon, 24 Oct 2022 17:15:41 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90D99153E34; Mon, 24 Oct 2022 12:21:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id D6282CE1331; Mon, 24 Oct 2022 11:45:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E27D4C433C1; Mon, 24 Oct 2022 11:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611954; bh=j8D/KeJTXJxe8JNBywbRj9NUB4PG3noMKhqa5JgyQlI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2hsT4EGmP8noBEkpFE3KXDiLKfW/IYg6A0rSCcvcE3oUc5s18kz7Z8S0o+nOgZuWA sXLppNXgygWHKia9u9B9ssnpXo8C8ev+mQlMoJB7F81nzjSu4SEy2QPlfbhLTi3p41 SeK8EKEVBhfMGACizzjd4udO22LmD+0IOaTWlOyU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chaitanya Kulkarni , Christoph Hellwig , Sasha Levin Subject: [PATCH 4.14 015/210] nvme: add new line after variable declatation Date: Mon, 24 Oct 2022 13:28:52 +0200 Message-Id: <20221024112957.418380442@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747605447868977364?= X-GMAIL-MSGID: =?utf-8?q?1747605447868977364?= From: Chaitanya Kulkarni [ Upstream commit f1c772d581843e3a14bbd62ef7e40b56fc307f27 ] Add a new line in functions nvme_pr_preempt(), nvme_pr_clear(), and nvme_pr_release() after variable declaration which follows the rest of the code in the nvme/host/core.c. No functional change(s) in this patch. Signed-off-by: Chaitanya Kulkarni Signed-off-by: Christoph Hellwig Stable-dep-of: c292a337d0e4 ("nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices") Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 2d95755092e3..487226531a7d 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1345,18 +1345,21 @@ static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new, enum pr_type type, bool abort) { u32 cdw10 = nvme_pr_type(type) << 8 | (abort ? 2 : 1); + return nvme_pr_command(bdev, cdw10, old, new, nvme_cmd_resv_acquire); } static int nvme_pr_clear(struct block_device *bdev, u64 key) { u32 cdw10 = 1 | (key ? 1 << 3 : 0); + return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_register); } static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type) { u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 1 << 3 : 0); + return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release); }