diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 20:01:25 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 20:01:25 +0300 |
| commit | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (patch) | |
| tree | 415aefe6d168df27c006fcc53b1ea5242eabaaea /drivers/block/nbd.c | |
| parent | 7ed40918a386afc2e14a6d3da563ea6d13686c25 (diff) | |
| parent | e650c305ec3178818b317dad37a6d9c7fa8ba28d (diff) | |
| download | linux-d99cf9d679a520d67f81d805b7cb91c68e1847f0.tar.xz | |
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>
Diffstat (limited to 'drivers/block/nbd.c')
| -rw-r--r-- | drivers/block/nbd.c | 2 |
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); } |