From: keith.busch@intel.com (Keith Busch)
Subject: [PATCHv2 3/4] nvme: Make nvme user functions static
Date: Tue, 29 Aug 2017 17:46:03 -0400 [thread overview]
Message-ID: <1504043164-5398-4-git-send-email-keith.busch@intel.com> (raw)
In-Reply-To: <1504043164-5398-1-git-send-email-keith.busch@intel.com>
These functions are used only locally in the nvme core.
Signed-off-by: Keith Busch <keith.busch at intel.com>
---
drivers/nvme/host/core.c | 10 +++++-----
drivers/nvme/host/nvme.h | 7 -------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index a28f181..4106e09 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -738,10 +738,10 @@ static void *nvme_add_user_metadata(struct bio *bio, void __user *ubuf,
return ERR_PTR(ret);
}
-int __nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,
- void __user *ubuffer, unsigned bufflen,
- void __user *meta_buffer, unsigned meta_len, u32 meta_seed,
- u32 *result, unsigned timeout)
+static int __nvme_submit_user_cmd(struct request_queue *q,
+ struct nvme_command *cmd, void __user *ubuffer,
+ unsigned bufflen, void __user *meta_buffer, unsigned meta_len,
+ u32 meta_seed, u32 *result, unsigned timeout)
{
bool write = nvme_is_write(cmd);
struct nvme_ns *ns = q->queuedata;
@@ -794,7 +794,7 @@ int __nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,
return ret;
}
-int nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,
+static int nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,
void __user *ubuffer, unsigned bufflen, u32 *result,
unsigned timeout)
{
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 1fc35de..194b4c8 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -342,13 +342,6 @@ int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
union nvme_result *result, void *buffer, unsigned bufflen,
unsigned timeout, int qid, int at_head, int flags);
-int nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,
- void __user *ubuffer, unsigned bufflen, u32 *result,
- unsigned timeout);
-int __nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,
- void __user *ubuffer, unsigned bufflen,
- void __user *meta_buffer, unsigned meta_len, u32 meta_seed,
- u32 *result, unsigned timeout);
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count);
void nvme_start_keep_alive(struct nvme_ctrl *ctrl);
void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
--
2.5.5
next prev parent reply other threads:[~2017-08-29 21:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-29 21:46 [PATCHv2 0/4] nvme user metadata updates Keith Busch
2017-08-29 21:46 ` [PATCHv2 1/4] nvme: factor metadata handling out of __nvme_submit_user_cmd Keith Busch
2017-08-29 22:20 ` Max Gurtovoy
2017-08-29 22:39 ` Keith Busch
2017-08-30 8:14 ` Christoph Hellwig
2017-08-29 21:46 ` [PATCHv2 2/4] nvme/pci: Use req_op to determine DIF remapping Keith Busch
2017-08-29 22:29 ` Max Gurtovoy
2017-08-30 8:15 ` Christoph Hellwig
2017-08-29 21:46 ` Keith Busch [this message]
2017-08-29 22:30 ` [PATCHv2 3/4] nvme: Make nvme user functions static Max Gurtovoy
2017-08-29 21:46 ` [PATCHv2 4/4] nvme: Use metadata for passthrough commands Keith Busch
2017-08-29 22:31 ` Max Gurtovoy
2017-08-30 8:15 ` [PATCHv2 0/4] nvme user metadata updates Christoph Hellwig
2017-08-30 10:06 ` Sagi Grimberg
2017-08-30 12:53 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1504043164-5398-4-git-send-email-keith.busch@intel.com \
--to=keith.busch@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox