From 41bcc451ba820d1dfb725d358bfc1cdd3e78bcec Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Wed, 14 Oct 2009 12:43:45 +0200 Subject: [PATCH] --- yaml --- r: 167476 b: refs/heads/master c: 03cadd36d51c737d7ad6aa21e2524296be6fe57f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/char/tape_block.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a8a45c20655..07dcab2b0c0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7874b1b66a53c4d9c8dcb37884cbb758aa2d712c +refs/heads/master: 03cadd36d51c737d7ad6aa21e2524296be6fe57f diff --git a/trunk/drivers/s390/char/tape_block.c b/trunk/drivers/s390/char/tape_block.c index 64f57ef2763c..0c0705b91c28 100644 --- a/trunk/drivers/s390/char/tape_block.c +++ b/trunk/drivers/s390/char/tape_block.c @@ -162,9 +162,10 @@ tapeblock_requeue(struct work_struct *work) { spin_lock_irq(&device->blk_data.request_queue_lock); while ( !blk_queue_plugged(queue) && - (req = blk_fetch_request(queue)) && + blk_peek_request(queue) && nr_queued < TAPEBLOCK_MIN_REQUEUE ) { + req = blk_fetch_request(queue); if (rq_data_dir(req) == WRITE) { DBF_EVENT(1, "TBLOCK: Rejecting write request\n"); spin_unlock_irq(&device->blk_data.request_queue_lock);