summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-09-18 08:57:53 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-09-18 08:57:53 -0700
commitb72173b04db65eff36559ae992880faf81735582 (patch)
treed69458580e7fbe6cc2205398ed9c612bdf6a607f
parentc08e4720715e350537d669180fecb7f7213d5f33 (diff)
parentba02d250d0ba62b66b9e4a503af2c3d69f7ad3fa (diff)
Merge http://gkernel.bkbits.net/irda-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
-rw-r--r--include/linux/nbd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index e2c507ba6b08..d2e9309f1a76 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -59,7 +59,7 @@ nbd_end_request(struct request *req)
blk_finished_io(nsect);
req->bio = bio->bi_next;
bio->bi_next = NULL;
- bio_endio(bio, uptodate);
+ bio_endio(bio, nsect << 9, uptodate ? 0 : -EIO);
}
blk_put_request(req);
spin_unlock_irqrestore(q->queue_lock, flags);