projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fs/coredump.c: log if a core dump is aborted due to changed file permissions
[linux-2.6-microblaze.git]
/
block
/
scsi_ioctl.c
diff --git
a/block/scsi_ioctl.c
b/block/scsi_ioctl.c
index
1b3fe99
..
d247431
100644
(file)
--- a/
block/scsi_ioctl.c
+++ b/
block/scsi_ioctl.c
@@
-254,9
+254,11
@@
static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,
*/
hdr->status = req->result & 0xff;
hdr->masked_status = status_byte(req->result);
*/
hdr->status = req->result & 0xff;
hdr->masked_status = status_byte(req->result);
- hdr->msg_status =
msg_byte(req->result)
;
+ hdr->msg_status =
COMMAND_COMPLETE
;
hdr->host_status = host_byte(req->result);
hdr->host_status = host_byte(req->result);
- hdr->driver_status = driver_byte(req->result);
+ hdr->driver_status = 0;
+ if (scsi_status_is_check_condition(hdr->status))
+ hdr->driver_status = DRIVER_SENSE;
hdr->info = 0;
if (hdr->masked_status || hdr->host_status || hdr->driver_status)
hdr->info |= SG_INFO_CHECK;
hdr->info = 0;
if (hdr->masked_status || hdr->host_status || hdr->driver_status)
hdr->info |= SG_INFO_CHECK;
@@
-311,7
+313,7
@@
static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
at_head = 1;
ret = -ENOMEM;
at_head = 1;
ret = -ENOMEM;
- rq = blk_get_request(q, writing ? REQ_OP_
SCSI_OUT : REQ_OP_SCSI
_IN, 0);
+ rq = blk_get_request(q, writing ? REQ_OP_
DRV_OUT : REQ_OP_DRV
_IN, 0);
if (IS_ERR(rq))
return PTR_ERR(rq);
req = scsi_req(rq);
if (IS_ERR(rq))
return PTR_ERR(rq);
req = scsi_req(rq);
@@
-433,7
+435,7
@@
int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
}
}
- rq = blk_get_request(q, in_len ? REQ_OP_
SCSI_OUT : REQ_OP_SCSI
_IN, 0);
+ rq = blk_get_request(q, in_len ? REQ_OP_
DRV_OUT : REQ_OP_DRV
_IN, 0);
if (IS_ERR(rq)) {
err = PTR_ERR(rq);
goto error_free_buffer;
if (IS_ERR(rq)) {
err = PTR_ERR(rq);
goto error_free_buffer;
@@
-484,9
+486,10
@@
int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
break;
}
break;
}
- if (bytes && blk_rq_map_kern(q, rq, buffer, bytes, GFP_NOIO)) {
- err = DRIVER_ERROR << 24;
- goto error;
+ if (bytes) {
+ err = blk_rq_map_kern(q, rq, buffer, bytes, GFP_NOIO);
+ if (err)
+ goto error;
}
blk_execute_rq(disk, rq, 0);
}
blk_execute_rq(disk, rq, 0);
@@
-521,7
+524,7
@@
static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk,
struct request *rq;
int err;
struct request *rq;
int err;
- rq = blk_get_request(q, REQ_OP_
SCSI
_OUT, 0);
+ rq = blk_get_request(q, REQ_OP_
DRV
_OUT, 0);
if (IS_ERR(rq))
return PTR_ERR(rq);
rq->timeout = BLK_DEFAULT_SG_TIMEOUT;
if (IS_ERR(rq))
return PTR_ERR(rq);
rq->timeout = BLK_DEFAULT_SG_TIMEOUT;