Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Date | Fri, 9 Jan 2009 11:06:22 +0100 | From | 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 <pavel@suse.cz>
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 <pavel@ucw.cz> + * Copyright 1997-2000, 2008 Pavel Machek <pavel@suse.cz> * Parts copyright 2001 Steven Whitehouse <steve@chygwyn.com> * * 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
| ![\](/images/icornerr.gif) |