diff options
| -rw-r--r-- | drivers/message/i2o/i2o_block.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index da9859f2caf2..b17c4b2bc9ef 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
| @@ -390,13 +390,6 @@ static int i2o_block_prep_req_fn(struct request_queue *q, struct request *req) | |||
| 390 | return BLKPREP_KILL; | 390 | return BLKPREP_KILL; |
| 391 | } | 391 | } |
| 392 | 392 | ||
| 393 | /* request is already processed by us, so return */ | ||
| 394 | if (blk_special_request(req)) { | ||
| 395 | osm_debug("REQ_SPECIAL already set!\n"); | ||
| 396 | req->cmd_flags |= REQ_DONTPREP; | ||
| 397 | return BLKPREP_OK; | ||
| 398 | } | ||
| 399 | |||
| 400 | /* connect the i2o_block_request to the request */ | 393 | /* connect the i2o_block_request to the request */ |
| 401 | if (!req->special) { | 394 | if (!req->special) { |
| 402 | ireq = i2o_block_request_alloc(); | 395 | ireq = i2o_block_request_alloc(); |
| @@ -408,11 +401,8 @@ static int i2o_block_prep_req_fn(struct request_queue *q, struct request *req) | |||
| 408 | ireq->i2o_blk_dev = i2o_blk_dev; | 401 | ireq->i2o_blk_dev = i2o_blk_dev; |
| 409 | req->special = ireq; | 402 | req->special = ireq; |
| 410 | ireq->req = req; | 403 | ireq->req = req; |
| 411 | } else | 404 | } |
| 412 | ireq = req->special; | ||
| 413 | |||
| 414 | /* do not come back here */ | 405 | /* do not come back here */ |
| 415 | req->cmd_type = REQ_TYPE_SPECIAL; | ||
| 416 | req->cmd_flags |= REQ_DONTPREP; | 406 | req->cmd_flags |= REQ_DONTPREP; |
| 417 | 407 | ||
| 418 | return BLKPREP_OK; | 408 | return BLKPREP_OK; |
