diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-14 11:56:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-14 11:56:01 +1100 |
| commit | 73dd2642876ec3d739e096ff88fa8d51b89c4fde (patch) | |
| tree | e0815bbf388e6dcdb7017db60b6c68aa37d5410f /include | |
| parent | f51dec955e0d11de4232fa6b6292cb08be6d35f7 (diff) | |
| parent | 53ca353594a254e6bd45ccf2d405aa31bcbb7091 (diff) | |
Merge remote branch 'scsi/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/enclosure.h | 2 | ||||
| -rw-r--r-- | include/scsi/osd_initiator.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h index 90d1c2184112..9a33c5f7e126 100644 --- a/include/linux/enclosure.h +++ b/include/linux/enclosure.h @@ -42,6 +42,8 @@ enum enclosure_status { ENCLOSURE_STATUS_NOT_INSTALLED, ENCLOSURE_STATUS_UNKNOWN, ENCLOSURE_STATUS_UNAVAILABLE, + /* last element for counting purposes */ + ENCLOSURE_STATUS_MAX }; /* SFF-8485 activity light settings */ diff --git a/include/scsi/osd_initiator.h b/include/scsi/osd_initiator.h index 39d6d1097153..a8f370126632 100644 --- a/include/scsi/osd_initiator.h +++ b/include/scsi/osd_initiator.h @@ -142,6 +142,7 @@ struct osd_request { struct _osd_io_info { struct bio *bio; u64 total_bytes; + u64 residual; struct request *req; struct _osd_req_data_segment *last_seg; u8 *pad_buff; @@ -150,12 +151,14 @@ struct osd_request { gfp_t alloc_flags; unsigned timeout; unsigned retries; + unsigned sense_len; u8 sense[OSD_MAX_SENSE_LEN]; enum osd_attributes_mode attributes_mode; osd_req_done_fn *async_done; void *async_private; int async_error; + int req_errors; }; static inline bool osd_req_is_ver1(struct osd_request *or) @@ -297,8 +300,6 @@ enum osd_err_priority { }; struct osd_sense_info { - u64 out_resid; /* Zero on success otherwise out residual */ - u64 in_resid; /* Zero on success otherwise in residual */ enum osd_err_priority osd_err_pri; int key; /* one of enum scsi_sense_keys */ |