From: Michal Feix <michal.feix@firma.seznam.cz>
Date: Sun, 30 Jul 2006 10:03:32 +0000 (-0700)
Subject: [PATCH] nbd: Abort request on data reception failure
X-Git-Tag: v2.6.18-rc4~126
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f0df33bcab4b687f0f18b9ebd69d374642e46a0e;p=linux-2.6-omap-h63xx.git

[PATCH] nbd: Abort request on data reception failure

When reading from nbd device, we need to receive all the data after
receiving reply packet from the server - otherwise such request will never
be ended.

If socket is closed right after accepting reply control packet and in the
middle of waiting for read data, nbd_read_stat() returns NULL and
nbd_end_request() is not called.

This patch fixes it.

Signed-off-by: Michal Feix <michal@feix.cz>
Acked-by: Paul Clements <paul.clements@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 31a0b605f26..bdbade9a5cf 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -341,7 +341,8 @@ static struct request *nbd_read_stat(struct nbd_device *lo)
 					printk(KERN_ERR "%s: Receive data failed (result %d)\n",
 							lo->disk->disk_name,
 							result);
-					goto harderror;
+					req->errors++;
+					return req;
 				}
 				dprintk(DBG_RX, "%s: request %p: got %d bytes data\n",
 					lo->disk->disk_name, req, bvec->bv_len);