From: Markus Pargmann <mpa@pengutronix.de>
To: nbd-general@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de,
Markus Pargmann <mpa@pengutronix.de>
Subject: [PATCH 08/10] nbd: Rename functions for clearness of recv/send path
Date: Mon, 27 Jul 2015 09:12:54 +0200 [thread overview]
Message-ID: <1437981176-21061-9-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1437981176-21061-1-git-send-email-mpa@pengutronix.de>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/block/nbd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 44160a9e493e..9862c3e64ff2 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -399,7 +399,7 @@ static struct device_attribute pid_attr = {
.show = pid_show,
};
-static int nbd_do_it(struct nbd_device *nbd)
+static int nbd_thread_recv(struct nbd_device *nbd)
{
struct request *req;
int ret;
@@ -530,7 +530,7 @@ error_out:
nbd_end_request(nbd, req);
}
-static int nbd_thread(void *data)
+static int nbd_thread_send(void *data)
{
struct nbd_device *nbd = data;
struct request *req;
@@ -584,7 +584,7 @@ static int nbd_thread(void *data)
* { printk( "Warning: Ignoring result!\n"); nbd_end_request( req ); }
*/
-static void do_nbd_request(struct request_queue *q)
+static void nbd_request_handler(struct request_queue *q)
__releases(q->queue_lock) __acquires(q->queue_lock)
{
struct request *req;
@@ -738,7 +738,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
else
blk_queue_flush(nbd->disk->queue, 0);
- thread = kthread_run(nbd_thread, nbd, "%s",
+ thread = kthread_run(nbd_thread_send, nbd, "%s",
nbd_name(nbd));
if (IS_ERR(thread)) {
mutex_lock(&nbd->tx_lock);
@@ -746,7 +746,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
}
nbd_dev_dbg_init(nbd);
- error = nbd_do_it(nbd);
+ error = nbd_thread_recv(nbd);
nbd_dev_dbg_close(nbd);
kthread_stop(thread);
@@ -1021,7 +1021,7 @@ static int __init nbd_init(void)
* every gendisk to have its very own request_queue struct.
* These structs are big so we dynamically allocate them.
*/
- disk->queue = blk_init_queue(do_nbd_request, &nbd_lock);
+ disk->queue = blk_init_queue(nbd_request_handler, &nbd_lock);
if (!disk->queue) {
put_disk(disk);
goto out;
--
2.1.4
next prev parent reply other threads:[~2015-07-27 7:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 7:12 [PATCH 00/10] nbd updates Markus Pargmann
2015-07-27 7:12 ` [PATCH 01/10] nbd: sock_shutdown, remove conditional lock Markus Pargmann
2015-08-02 7:08 ` Pavel Machek
2015-07-27 7:12 ` [PATCH 02/10] nbd: restructure sock_shutdown Markus Pargmann
2015-08-02 7:08 ` Pavel Machek
2015-08-02 18:51 ` Markus Pargmann
2015-07-27 7:12 ` [PATCH 03/10] nbd: Remove 'harderror' and propagate error properly Markus Pargmann
2015-08-02 7:02 ` Pavel Machek
2015-07-27 7:12 ` [PATCH 04/10] nbd: Move clear queue debug message Markus Pargmann
2015-07-27 7:12 ` [PATCH 05/10] nbd: Remove variable 'pid' Markus Pargmann
2015-07-27 7:12 ` [PATCH 06/10] nbd: Add debugfs entries Markus Pargmann
2015-07-27 7:12 ` [PATCH 07/10] nbd: Change 'disconnect' to be boolean Markus Pargmann
2015-08-05 16:11 ` Pavel Machek
2015-07-27 7:12 ` Markus Pargmann [this message]
2015-07-27 7:12 ` [PATCH 09/10] nbd: flags is a u32 variable Markus Pargmann
2015-07-27 7:12 ` [PATCH 10/10] nbd: Create size change events for userspace Markus Pargmann
2015-07-27 9:39 ` Markus Pargmann
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=1437981176-21061-9-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=nbd-general@lists.sourceforge.net \
/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
all inboxes | Powered by JetHome®