Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-07-14 12:49:01 -07:00
commit 26fe533aaf
1 changed files with 1 additions and 1 deletions

View File

@ -125,7 +125,7 @@ blk_end_request_x(struct request *req, int error, unsigned int nr_bytes)
bool rc; bool rc;
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
__blk_end_request_x(req, error, nr_bytes); rc = __blk_end_request_x(req, error, nr_bytes);
spin_unlock_irq(q->queue_lock); spin_unlock_irq(q->queue_lock);
return rc; return rc;