Re: [PATCH v10 6/9] nvme: Export existing nvme core functions

[Logan Gunthorpe]

On 2020-01-08 2:48 p.m., Max Gurtovoy wrote:
> 
> On 1/8/2020 7:40 PM, Logan Gunthorpe wrote:
>> Export nvme_put_ns(), nvme_command_effects(), nvme_execute_passthru_rq()
>> and nvme_find_get_ns() for use in the nvmet passthru code.
>>
>> The exports are conditional on CONFIG_NVME_TARGET_PASSTHRU.
>>
>> Based-on-a-patch-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>
>> Signed-off-by: Logan Gunthorpe <logang@xxxxxxxxxxxx>
>> ---
>> Â drivers/nvme/host/core.c | 14 +++++++++-----
>> Â drivers/nvme/host/nvme.h |Â 5 +++++
>> Â 2 files changed, 14 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
>> index d7912e7a9911..037415882d46 100644
>> --- a/drivers/nvme/host/core.c
>> +++ b/drivers/nvme/host/core.c
>> @@ -463,7 +463,7 @@ static void nvme_free_ns(struct kref *kref)
>> ÂÂÂÂÂ kfree(ns);
>> Â }
>> Â -static void nvme_put_ns(struct nvme_ns *ns)
>> +void nvme_put_ns(struct nvme_ns *ns)
>> Â {
>> ÂÂÂÂÂ kref_put(&ns->kref, nvme_free_ns);
>> Â }
>> @@ -896,8 +896,8 @@ static void *nvme_add_user_metadata(struct bio
>> *bio, void __user *ubuf,
>> ÂÂÂÂÂ return ERR_PTR(ret);
>> Â }
>> Â -static u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct
>> nvme_ns *ns,
>> -ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ u8 opcode)
>> +u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
>> +ÂÂÂÂÂÂÂÂÂÂÂÂ u8 opcode)
>> Â {
>> ÂÂÂÂÂ u32 effects = 0;
>> Â @@ -982,7 +982,7 @@ static void nvme_passthru_end(struct nvme_ctrl
>> *ctrl, u32 effects)
>> ÂÂÂÂÂÂÂÂÂ nvme_queue_scan(ctrl);
>> Â }
>> Â -static void nvme_execute_passthru_rq(struct request *rq)
>> +void nvme_execute_passthru_rq(struct request *rq)
>> Â {
>> ÂÂÂÂÂ struct nvme_command *cmd = nvme_req(rq)->cmd;
>> ÂÂÂÂÂ struct nvme_ctrl *ctrl = nvme_req(rq)->ctrl;
>> @@ -3441,7 +3441,7 @@ static int ns_cmp(void *priv, struct list_head
>> *a, struct list_head *b)
>> ÂÂÂÂÂ return nsa->head->ns_id - nsb->head->ns_id;
>> Â }
>> Â -static struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl,
>> unsigned nsid)
>> +struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid)
>> Â {
>> ÂÂÂÂÂ struct nvme_ns *ns, *ret = NULL;
>> Â @@ -4225,6 +4225,10 @@ EXPORT_SYMBOL_GPL(nvme_sync_queues);
>> ÂÂ * use by the nvmet-passthru and should not be used for
>> ÂÂ * other things.
>> ÂÂ */
>> +EXPORT_SYMBOL_GPL(nvme_put_ns);
>> +EXPORT_SYMBOL_GPL(nvme_command_effects);
>> +EXPORT_SYMBOL_GPL(nvme_execute_passthru_rq);
>> +EXPORT_SYMBOL_GPL(nvme_find_get_ns);
> 
> Since this is the convention in the driver, can you export the symbols
> at the end of each function ?

Christoph specifically asked for these to be exported at the end of the
file within an #ifdef CONFIG_NVME_TARGET_PASSTHRU.

Logan