scsi_dh_emc: request flag cleanup

commit 5738d4449c1baf05e8345684d12371f76296473d upstream.

blk_get_request sets the cmd_flags, so we should not and do not
need to set them. If we did set them to a different value then
it can cause a oops in the elevator code.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index e797410da8eec762b6ab29b691c7803887f1587f..260cbaec7674eb8b4a37b5a42b8511096b0c848c 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -284,13 +284,11 @@ static struct request *get_req(struct scsi_device *sdev, int cmd,
        switch (cmd) {
        case MODE_SELECT:
                len = sizeof(short_trespass);
-               rq->cmd_flags |= REQ_RW;
                rq->cmd[1] = 0x10;
                rq->cmd[4] = len;
                break;
        case MODE_SELECT_10:
                len = sizeof(long_trespass);
-               rq->cmd_flags |= REQ_RW;
                rq->cmd[1] = 0x10;
                rq->cmd[8] = len;
                break;