Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <e2f636e1-33ff-3d9f-a793-960f239d0bc2@infradead.org>
Date:   Tue, 17 May 2022 22:21:53 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Subject: Re: linux-next: Tree for May 17 (drivers/nvme/host/fc.o)
Content-Language: en-US
To:     Christoph Hellwig <hch@lst.de>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        James Smart <james.smart@broadcom.com>,
        linux-nvme@lists.infradead.org
References: <20220517194118.2caa01b8@canb.auug.org.au>
 <5958ccea-d89c-8b1a-15d3-19d8cacd141d@infradead.org>
 <20220518045704.GA30131@lst.de>
From:   Randy Dunlap <rdunlap@infradead.org>
In-Reply-To: <20220518045704.GA30131@lst.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 5/17/22 21:57, Christoph Hellwig wrote:
> The patch that adds nvme_fc_io_getuuid need something like this
> folded in:
> 
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index a11c69e681180..3c778bb0c2944 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -1911,7 +1911,9 @@ char *nvme_fc_io_getuuid(struct nvmefc_fcp_req *req)
>  	struct nvme_fc_fcp_op *op = fcp_req_to_fcp_op(req);
>  	struct request *rq = op->rq;
>  
> -	return rq->bio ? blkcg_get_fc_appid(rq->bio) : NULL;
> +	if (!IS_ENABLED(CONFIG_BLK_CGROUP_FC_APPID) || !rq->bio)
> +		return NULL;
> +	return blkcg_get_fc_appid(rq->bio);
>  }
>  EXPORT_SYMBOL_GPL(nvme_fc_io_getuuid);
>  

Thanks. You can add

Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>

to the patch.

-- 
~Randy