diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 08:58:35 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 08:58:35 +0100 |
| commit | 4c63f5646e405b5010cc9499419060bf2e838f5b (patch) | |
| tree | df91ba315032c8ec4aafeb3ab96fdfa7c6c656e1 /drivers/s390 | |
| parent | cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24 (diff) | |
| parent | 69d60eb96ae8a73cf9b79cf28051caf973006011 (diff) | |
| download | talos-op-linux-4c63f5646e405b5010cc9499419060bf2e838f5b.tar.gz talos-op-linux-4c63f5646e405b5010cc9499419060bf2e838f5b.zip | |
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
Conflicts:
block/blk-core.c
block/blk-flush.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
fs/nilfs2/btnode.c
fs/nilfs2/mdt.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/block/dasd.c | 2 | ||||
| -rw-r--r-- | drivers/s390/char/tape_block.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 794bfd962266..4d2df2f76ea0 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -1917,7 +1917,7 @@ static void __dasd_process_request_queue(struct dasd_block *block) return; } /* Now we try to fetch requests from the request queue */ - while (!blk_queue_plugged(queue) && (req = blk_peek_request(queue))) { + while ((req = blk_peek_request(queue))) { if (basedev->features & DASD_FEATURE_READONLY && rq_data_dir(req) == WRITE) { DBF_DEV_EVENT(DBF_ERR, basedev, diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index ad8431636012..83cea9a55e2f 100644 --- a/drivers/s390/char/tape_block.c +++ b/drivers/s390/char/tape_block.c @@ -161,7 +161,6 @@ tapeblock_requeue(struct work_struct *work) { spin_lock_irq(&device->blk_data.request_queue_lock); while ( - !blk_queue_plugged(queue) && blk_peek_request(queue) && nr_queued < TAPEBLOCK_MIN_REQUEUE ) { |
