2009-01-09 10:04:25

by Pavel Machek

Subject: nbd: trivial cleanups

Trivial cleanups for nbd: only the return -EIO one really changes
code, and I've verified all the callers (plus 0 == success, 1 == error
convention is really ugly).

Signed-off-by: Pavel Machek <[email protected]>


diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 7bcc1d8..670e89d 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -4,7 +4,7 @@
* Note that you can not swap over this thing, yet. Seems to work but
* deadlocks sometimes - you can not swap over TCP in general.
*
- * Copyright 1997-2000 Pavel Machek <[email protected]>
+ * Copyright 1997-2000, 2008 Pavel Machek <[email protected]>
* Parts copyright 2001 Steven Whitehouse <[email protected]>
*
* This file is released under GPLv2 or later.
@@ -276,7 +276,7 @@ static int nbd_send_req(struct nbd_devic
return 0;

error_out:
- return 1;
+ return -EIO;
}

static struct request *nbd_find_request(struct nbd_device *lo,
@@ -465,9 +465,7 @@ static void nbd_handle_req(struct nbd_de
mutex_unlock(&lo->tx_lock);
printk(KERN_ERR "%s: Attempted send on closed socket\n",
lo->disk->disk_name);
- req->errors++;
- nbd_end_request(req);
- return;
+ goto error_out;
}

lo->active_req = req;
@@ -529,7 +527,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 do_nbd_request(struct request_queue *q)
{
struct request *req;

@@ -563,7 +561,7 @@ static int nbd_ioctl(struct block_device
struct nbd_device *lo = bdev->bd_disk->private_data;
struct file *file;
int error;
- struct request sreq ;
+ struct request sreq;
struct task_struct *thread;

if (!capable(CAP_SYS_ADMIN))

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2009-01-09 12:48:50

by Paul Clements

Subject: Re: nbd: trivial cleanups

Pavel Machek wrote:
> Trivial cleanups for nbd: only the return -EIO one really changes
> code, and I've verified all the callers (plus 0 == success, 1 == error
> convention is really ugly).
>
> Signed-off-by: Pavel Machek <[email protected]>

Looks good

2009-01-10 21:20:14

by Pavel Machek

Subject: Re: nbd: trivial cleanups

On Fri 2009-01-09 07:48:36, Paul Clements wrote:
> Pavel Machek wrote:
>> Trivial cleanups for nbd: only the return -EIO one really changes
>> code, and I've verified all the callers (plus 0 == success, 1 == error
>> convention is really ugly).
>>
>> Signed-off-by: Pavel Machek <[email protected]>
>
> Looks good

Does it mean I can add your acked-by and merge it through Andrew?
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html