diff options
Diffstat (limited to 'block/scsi_ioctl.c')
-rw-r--r-- | block/scsi_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index b33eda26e205..2dc326421a24 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
@@ -294,7 +294,7 @@ static int sg_io(struct file *file, request_queue_t *q, | |||
294 | rq->sense = sense; | 294 | rq->sense = sense; |
295 | rq->sense_len = 0; | 295 | rq->sense_len = 0; |
296 | 296 | ||
297 | rq->flags |= REQ_BLOCK_PC; | 297 | rq->cmd_type = REQ_TYPE_BLOCK_PC; |
298 | bio = rq->bio; | 298 | bio = rq->bio; |
299 | 299 | ||
300 | /* | 300 | /* |
@@ -470,7 +470,7 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q, | |||
470 | memset(sense, 0, sizeof(sense)); | 470 | memset(sense, 0, sizeof(sense)); |
471 | rq->sense = sense; | 471 | rq->sense = sense; |
472 | rq->sense_len = 0; | 472 | rq->sense_len = 0; |
473 | rq->flags |= REQ_BLOCK_PC; | 473 | rq->cmd_type = REQ_TYPE_BLOCK_PC; |
474 | 474 | ||
475 | blk_execute_rq(q, disk, rq, 0); | 475 | blk_execute_rq(q, disk, rq, 0); |
476 | 476 | ||
@@ -502,7 +502,7 @@ static int __blk_send_generic(request_queue_t *q, struct gendisk *bd_disk, int c | |||
502 | int err; | 502 | int err; |
503 | 503 | ||
504 | rq = blk_get_request(q, WRITE, __GFP_WAIT); | 504 | rq = blk_get_request(q, WRITE, __GFP_WAIT); |
505 | rq->flags |= REQ_BLOCK_PC; | 505 | rq->cmd_type = REQ_TYPE_BLOCK_PC; |
506 | rq->data = NULL; | 506 | rq->data = NULL; |
507 | rq->data_len = 0; | 507 | rq->data_len = 0; |
508 | rq->timeout = BLK_DEFAULT_TIMEOUT; | 508 | rq->timeout = BLK_DEFAULT_TIMEOUT; |