Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b847548663ef1039dd49f0eb4463d001e596bc3.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index d5c8ee7d9815..33d6f237b2ed 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -140,7 +140,7 @@ static void nbd_end_request(struct request *req)
 
         spin_lock_irqsave(q->queue_lock, flags);
         if (!end_that_request_first(req, uptodate, req->nr_sectors)) {
-                end_that_request_last(req);
+                end_that_request_last(req, uptodate);
         }
         spin_unlock_irqrestore(q->queue_lock, flags);
 }