Merge commit 'v2.6.26' into bkl-removal

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index ddc4a114e7f4..95da72bc17e8 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -179,11 +179,11 @@ tapeblock_requeue(struct work_struct *work) {
                         tapeblock_end_request(req, -EIO);
                         continue;
                 }
+                blkdev_dequeue_request(req);
+                nr_queued++;
                 spin_unlock_irq(&device->blk_data.request_queue_lock);
                 rc = tapeblock_start_request(device, req);
                 spin_lock_irq(&device->blk_data.request_queue_lock);
-                blkdev_dequeue_request(req);
-                nr_queued++;
         }
         spin_unlock_irq(&device->blk_data.request_queue_lock);
         atomic_set(&device->blk_data.requeue_scheduled, 0);