Skip to content

Commit

Permalink
nbd: Rename functions for clearness of recv/send path
Browse files Browse the repository at this point in the history
This patch renames functions so that it is clear what the function does.
Otherwise it is not directly understandable what for example 'do_it' means.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Markus Pargmann authored and Jens Axboe committed Aug 17, 2015
1 parent 696697c commit cad73b2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/block/nbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -530,7 +530,7 @@ static void nbd_handle_req(struct nbd_device *nbd, struct request *req)
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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -738,15 +738,15 @@ 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);
return PTR_ERR(thread);
}

nbd_dev_dbg_init(nbd);
error = nbd_do_it(nbd);
error = nbd_thread_recv(nbd);
nbd_dev_dbg_close(nbd);
kthread_stop(thread);

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit cad73b2

Please sign in to comment.