From patchwork Mon Oct 24 11:29:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8546 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp417001wru; Mon, 24 Oct 2022 05:12:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7r5sBDMN1FIKN+OLXR9NBqStZ7FvB6vtC9Na0lqIubuwtJsaaMyrn0rpHN9/wuhFfMkfvz X-Received: by 2002:a17:902:e849:b0:17f:f3c4:a2c4 with SMTP id t9-20020a170902e84900b0017ff3c4a2c4mr32954552plg.125.1666613539218; Mon, 24 Oct 2022 05:12:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666613539; cv=none; d=google.com; s=arc-20160816; b=sDGFasqqoQc0F6LqKcg5DwTdiV3NA/0DbrA9WgKmYYm8Bp+WRgoraV/3lFM+iM9slt rwKnivoAUQxBs444sZBjCnDVQNbDKORMMGuOOeFxvhDXGNshtc3s9u5xD+gnkhdyF4Cr Z+npXsoL5ZiaV5WlpgI76a0VcLviGXu12RSd+mmZsidBt8ctxjeL/Y8QINMi50+hSJNr 8yy12CL3CuO+W0WizdKydNJXZtzXEbQH5LvkbjsywlcRCi+IopAJYXOkR+ZZJSnkHiZp YAp1VtYMhOYnVvcF3Xjv2f9dXuclqW/WcSGOH3sgtxw5xdL3tw3yr9OycUowEkh1ACju iV8A== 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=gNwqXxRtJVMUwRihUKG5KrEEiujicUVfpJxR0PSX1OY=; b=bRC7Bt/w4MCV/kkTCgXqhpku4+GkH6qxaqsEJ3LL9Tw4JithokvR0Se2Xc629xC5qj Yhg6Ok6sPeuQa0mKVrrKSwpZH87NQ+B87y1FRIP5EwbwBOvy3ImISkz28KBb4VuUORWB 1zx918fbPxIXA08kX+RYk5BjsN69LDdKEWgeuy/48MrE/euyu2Rc/ioAEEWFbVG7pK4V F/o4BDD3kzCfvcSQIF0b/hhXqMAuczShHEaghoEI8Hi2/+PUJbMnPW4APNuBE27IjB/v Uig/Cp1kqlHZmVPuJWVIAZJEAT6bj1/CxfZ+MIgujyelNJHci6Ul0vUFo5jXyicRBA6M 3fDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=B+BdPdTd; 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 oj10-20020a17090b4d8a00b0020d887ded6esi17016228pjb.120.2022.10.24.05.12.04; Mon, 24 Oct 2022 05:12:19 -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=B+BdPdTd; 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 S230090AbiJXMAl (ORCPT + 99 others); Mon, 24 Oct 2022 08:00:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232145AbiJXL6g (ORCPT ); Mon, 24 Oct 2022 07:58:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89AA72A278; Mon, 24 Oct 2022 04:47:54 -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 dfw.source.kernel.org (Postfix) with ESMTPS id BDBF461280; Mon, 24 Oct 2022 11:38:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AED4CC433D6; Mon, 24 Oct 2022 11:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611521; bh=vDIOLrtOH91TGb5ga4pN6oJWrbydeWF2GLGCeCY+H/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B+BdPdTdTwu6JCaa91eK2oS0h4q8I1R3vc0uiDTxaFRsRWM0GYhumVkXjUND4mkfY v3DyzXq2skM361jTtrqg7/mfGmapZLm73oisFkfPZNwbDUIMhZ1GvCdzzKgv1Qml44 Z0S64wipGP3kb9DnUyYgwlHStINarFOCPzssDd5k= 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.9 011/159] nvme: add new line after variable declatation Date: Mon, 24 Oct 2022 13:29:25 +0200 Message-Id: <20221024112949.772495354@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747570958231771939?= X-GMAIL-MSGID: =?utf-8?q?1747570958231771939?= 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 9561a247d0dc..051bc7430af2 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1044,18 +1044,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); }