1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index d797e209951d..936466f62afd 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -199,7 +199,8 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,
                 if (blk_fs_request(req)) {
                         if (ps3disk_submit_request_sg(dev, req))
                                 break;
-                } else if (req->cmd_type == REQ_TYPE_FLUSH) {
+                } else if (req->cmd_type == REQ_TYPE_LINUX_BLOCK &&
+                           req->cmd[0] == REQ_LB_OP_FLUSH) {
                         if (ps3disk_submit_flush_request(dev, req))
                                 break;
                 } else {
@@ -257,7 +258,8 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)
                 return IRQ_HANDLED;
         }
 
-        if (req->cmd_type == REQ_TYPE_FLUSH) {
+        if (req->cmd_type == REQ_TYPE_LINUX_BLOCK &&
+            req->cmd[0] == REQ_LB_OP_FLUSH) {
                 read = 0;
                 num_sectors = req->hard_cur_sectors;
                 op = "flush";
@@ -405,7 +407,8 @@ static void ps3disk_prepare_flush(struct request_queue *q, struct request *req)
 
         dev_dbg(&dev->sbd.core, "%s:%u\n", __func__, __LINE__);
 
-        req->cmd_type = REQ_TYPE_FLUSH;
+        req->cmd_type = REQ_TYPE_LINUX_BLOCK;
+        req->cmd[0] = REQ_LB_OP_FLUSH;
 }
 
 static unsigned long ps3disk_mask;
@@ -538,7 +541,7 @@ static int ps3disk_remove(struct ps3_system_bus_device *_dev)
         struct ps3disk_private *priv = dev->sbd.core.driver_data;
 
         mutex_lock(&ps3disk_mask_mutex);
-        __clear_bit(priv->gendisk->first_minor / PS3DISK_MINORS,
+        __clear_bit(MINOR(disk_devt(priv->gendisk)) / PS3DISK_MINORS,
                     &ps3disk_mask);
         mutex_unlock(&ps3disk_mask_mutex);
         del_gendisk(priv->gendisk);