Skip to content

L
linux
Commit c27a298f authored by Douglas Gilbert's avatar Douglas Gilbert Committed by James Bottomley
Browse files
Options

[PATCH] block scsi_ioctl.c lk 2.5.66 

This is a multi-part message in MIME format.
parent b7709c3e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
drivers/block/scsi_ioctl.c
View file @ c27a298f
...@@ -45,7 +45,8 @@ const unsigned char scsi_command_size[8] = ...@@ -45,7 +45,8 @@ const unsigned char scsi_command_size[8] =
#define SCSI_SENSE_BUFFERSIZE 64 #define SCSI_SENSE_BUFFERSIZE 64
#endif #endif
int blk_do_rq(request_queue_t *q, struct block_device *bdev, struct request *rq) static int blk_do_rq(request_queue_t *q, struct block_device *bdev,
struct request *rq)
{ {
DECLARE_COMPLETION(wait); DECLARE_COMPLETION(wait);
int err = 0; int err = 0;
...@@ -368,6 +369,7 @@ static int sg_scsi_ioctl(request_queue_t *q, struct block_device *bdev, ...@@ -368,6 +369,7 @@ static int sg_scsi_ioctl(request_queue_t *q, struct block_device *bdev,
goto error; goto error;
switch (opcode) { switch (opcode) {
case SEND_DIAGNOSTIC:
case FORMAT_UNIT: case FORMAT_UNIT:
rq->timeout = FORMAT_UNIT_TIMEOUT; rq->timeout = FORMAT_UNIT_TIMEOUT;
break; break;
...@@ -398,7 +400,8 @@ static int sg_scsi_ioctl(request_queue_t *q, struct block_device *bdev, ...@@ -398,7 +400,8 @@ static int sg_scsi_ioctl(request_queue_t *q, struct block_device *bdev,
if (in_len) if (in_len)
rq->flags |= REQ_RW; rq->flags |= REQ_RW;
err = blk_do_rq(q, bdev, rq); blk_do_rq(q, bdev, rq);
err = rq->errors & 0xff; /* only 8 bit SCSI status */
if (err) { if (err) {
if (rq->sense_len) if (rq->sense_len)
if (copy_to_user(sic->data, rq->sense, rq->sense_len)) if (copy_to_user(sic->data, rq->sense, rq->sense_len))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7