lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nbd: trivial cleanups

Browse Source 
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>
Acked-by: Paul Clements <paul.clements@steeleye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Pavel Machek
2009-04-02 16:58:42 -07:00
committed by Linus Torvalds
parent 1a2ad21128
commit 15746fcaa3
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/block/nbd.c
View File

@@ -4,7 +4,7 @@
* Note that you can not swap over this thing, yet. Seems to work but * Note that you can not swap over this thing, yet. Seems to work but
* deadlocks sometimes - you can not swap over TCP in general. * 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> * Parts copyright 2001 Steven Whitehouse <steve@chygwyn.com>
* *
* This file is released under GPLv2 or later. * This file is released under GPLv2 or later.
@@ -276,7 +276,7 @@ static int nbd_send_req(struct nbd_device *lo, struct request *req)
return 0; return 0;
error_out: error_out:
return 1; return -EIO;
} }
static struct request *nbd_find_request(struct nbd_device *lo, static struct request *nbd_find_request(struct nbd_device *lo,
@@ -467,9 +467,7 @@ static void nbd_handle_req(struct nbd_device *lo, struct request *req)
mutex_unlock(&lo->tx_lock); mutex_unlock(&lo->tx_lock);
printk(KERN_ERR "%s: Attempted send on closed socket\n", printk(KERN_ERR "%s: Attempted send on closed socket\n",
lo->disk->disk_name); lo->disk->disk_name);
req->errors++; goto error_out;
nbd_end_request(req);
return;
} }
lo->active_req = req; lo->active_req = req;
@@ -531,7 +529,7 @@ static int nbd_thread(void *data)
* { printk( "Warning: Ignoring result!\n"); nbd_end_request( req ); } * { 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; struct request *req;