diff options
author | James Bottomley <James.Bottomley@SteelEye.com> | 2005-06-20 08:11:09 -0400 |
---|---|---|
committer | Jens Axboe <axboe@suse.de> | 2005-06-20 08:11:09 -0400 |
commit | 994ca9a19616f0d4161a9e825f0835925d522426 (patch) | |
tree | 0998252ed375929dca468440b7486d4c1104757f /drivers/block/scsi_ioctl.c | |
parent | f63eb21b4f32028755b6b9d47e5eb13c18ba0cae (diff) |
[PATCH] update blk_execute_rq to take an at_head parameter
Original From: Mike Christie <michaelc@cs.wisc.edu>
Modified to split out block changes (this patch) and SCSI pieces.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/block/scsi_ioctl.c')
-rw-r--r-- | drivers/block/scsi_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c index 7717b76f7f20..abb2df249fd3 100644 --- a/drivers/block/scsi_ioctl.c +++ b/drivers/block/scsi_ioctl.c | |||
@@ -308,7 +308,7 @@ static int sg_io(struct file *file, request_queue_t *q, | |||
308 | * (if he doesn't check that is his problem). | 308 | * (if he doesn't check that is his problem). |
309 | * N.B. a non-zero SCSI status is _not_ necessarily an error. | 309 | * N.B. a non-zero SCSI status is _not_ necessarily an error. |
310 | */ | 310 | */ |
311 | blk_execute_rq(q, bd_disk, rq); | 311 | blk_execute_rq(q, bd_disk, rq, 0); |
312 | 312 | ||
313 | /* write to all output members */ | 313 | /* write to all output members */ |
314 | hdr->status = 0xff & rq->errors; | 314 | hdr->status = 0xff & rq->errors; |
@@ -420,7 +420,7 @@ static int sg_scsi_ioctl(struct file *file, request_queue_t *q, | |||
420 | rq->data_len = bytes; | 420 | rq->data_len = bytes; |
421 | rq->flags |= REQ_BLOCK_PC; | 421 | rq->flags |= REQ_BLOCK_PC; |
422 | 422 | ||
423 | blk_execute_rq(q, bd_disk, rq); | 423 | blk_execute_rq(q, bd_disk, rq, 0); |
424 | err = rq->errors & 0xff; /* only 8 bit SCSI status */ | 424 | err = rq->errors & 0xff; /* only 8 bit SCSI status */ |
425 | if (err) { | 425 | if (err) { |
426 | if (rq->sense_len && rq->sense) { | 426 | if (rq->sense_len && rq->sense) { |
@@ -573,7 +573,7 @@ int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd, | |||
573 | rq->cmd[0] = GPCMD_START_STOP_UNIT; | 573 | rq->cmd[0] = GPCMD_START_STOP_UNIT; |
574 | rq->cmd[4] = 0x02 + (close != 0); | 574 | rq->cmd[4] = 0x02 + (close != 0); |
575 | rq->cmd_len = 6; | 575 | rq->cmd_len = 6; |
576 | err = blk_execute_rq(q, bd_disk, rq); | 576 | err = blk_execute_rq(q, bd_disk, rq, 0); |
577 | blk_put_request(rq); | 577 | blk_put_request(rq); |
578 | break; | 578 | break; |
579 | default: | 579 | default: |