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/block/cciss.c | |
| parent | cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24 (diff) | |
| parent | 69d60eb96ae8a73cf9b79cf28051caf973006011 (diff) | |
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/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 9279272b373..35658f445fc 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -3170,12 +3170,6 @@ static void do_cciss_request(struct request_queue *q) int sg_index = 0; int chained = 0; - /* We call start_io here in case there is a command waiting on the - * queue that has not been sent. - */ - if (blk_queue_plugged(q)) - goto startio; - queue: creq = blk_peek_request(q); if (!creq) |