projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-perf' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
include
/
scsi
/
scsi_eh.h
diff --git
a/include/scsi/scsi_eh.h
b/include/scsi/scsi_eh.h
index d3a133b4a072bf2104a0204d29084be7b79bd186..06a8790893ef60e15cdd100550134e698e6a5e2e 100644
(file)
--- a/
include/scsi/scsi_eh.h
+++ b/
include/scsi/scsi_eh.h
@@
-74,12
+74,14
@@
struct scsi_eh_save {
/* saved state */
int result;
enum dma_data_direction data_direction;
/* saved state */
int result;
enum dma_data_direction data_direction;
+ unsigned underflow;
unsigned char cmd_len;
unsigned char cmd_len;
- unsigned char cmnd[MAX_COMMAND_SIZE];
+ unsigned char prot_op;
+ unsigned char *cmnd;
struct scsi_data_buffer sdb;
struct request *next_rq;
struct scsi_data_buffer sdb;
struct request *next_rq;
-
/* new command support */
/* new command support */
+ unsigned char eh_cmnd[BLK_MAX_CDB];
struct scatterlist sense_sgl;
};
struct scatterlist sense_sgl;
};