Merge branch 'master' into upstream

2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
index fef677103880..6443392bffff 100644
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/message/i2o/Kconfig
@@ -88,7 +88,7 @@ config I2O_BUS
 
 config I2O_BLOCK
         tristate "I2O Block OSM"
-        depends on I2O
+        depends on I2O && BLOCK
         ---help---
           Include support for the I2O Block OSM. The Block OSM presents disk
           and other structured block devices to the operating system. If you
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 1ddc2fb429d5..eaba81bf2eca 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -390,9 +390,9 @@ static int i2o_block_prep_req_fn(struct request_queue *q, struct request *req)
         }
 
         /* request is already processed by us, so return */
-        if (req->flags & REQ_SPECIAL) {
+        if (blk_special_request(req)) {
                 osm_debug("REQ_SPECIAL already set!\n");
-                req->flags |= REQ_DONTPREP;
+                req->cmd_flags |= REQ_DONTPREP;
                 return BLKPREP_OK;
         }
 
@@ -411,7 +411,8 @@ static int i2o_block_prep_req_fn(struct request_queue *q, struct request *req)
                 ireq = req->special;
 
         /* do not come back here */
-        req->flags |= REQ_DONTPREP | REQ_SPECIAL;
+        req->cmd_type = REQ_TYPE_SPECIAL;
+        req->cmd_flags |= REQ_DONTPREP;
 
         return BLKPREP_OK;
 };