diff options
| author | Michal Feix <michal.feix@firma.seznam.cz> | 2006-07-30 12:03:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-31 22:28:39 +0200 |
| commit | f0df33bcab4b687f0f18b9ebd69d374642e46a0e (patch) | |
| tree | 808ecf0e290eb67063fd1d42af53ed611b486590 | |
| parent | [PATCH] nbd: Check magic before doing anything else (diff) | |
| download | linux-f0df33bcab4b687f0f18b9ebd69d374642e46a0e.tar.xz linux-f0df33bcab4b687f0f18b9ebd69d374642e46a0e.zip | |
[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>
| -rw-r--r-- | drivers/block/nbd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 31a0b605f261..bdbade9a5cf5 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); |