diff --git a/[refs] b/[refs] index 04f5e7714aa8..2ba2502a225f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4b57e0842621f597d744b193ea325d62724596b +refs/heads/master: f0df33bcab4b687f0f18b9ebd69d374642e46a0e diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c index 31a0b605f261..bdbade9a5cf5 100644 --- a/trunk/drivers/block/nbd.c +++ b/trunk/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);