From a35453c5c9c5905969e2dce3b6ddee9f440356f0 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Thu, 2 Apr 2009 16:58:42 -0700 Subject: [PATCH] --- yaml --- r: 139713 b: refs/heads/master c: 15746fcaa3a00753bbab2326088b85b10c1ba36a h: refs/heads/master i: 139711: bfbdd06ae4d97601d57b5e483d1fb3e04207b0c0 v: v3 --- [refs] | 2 +- trunk/drivers/block/nbd.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index af2049cc8e15..35b0a89ea182 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a2ad21128bb4eb79f3c05e5801edcc5ed3ef1d3 +refs/heads/master: 15746fcaa3a00753bbab2326088b85b10c1ba36a diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c index 5e982814797d..4d6de4f15ccb 100644 --- a/trunk/drivers/block/nbd.c +++ b/trunk/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 + * Copyright 1997-2000, 2008 Pavel Machek * Parts copyright 2001 Steven Whitehouse * * 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; error_out: - return 1; + return -EIO; } 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); 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; @@ -531,7 +529,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;