git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
scsi
/
st.h
diff --git
a/drivers/scsi/st.h
b/drivers/scsi/st.h
index
061da11
..
4112090
100644
(file)
--- a/
drivers/scsi/st.h
+++ b/
drivers/scsi/st.h
@@
-3,7
+3,8
@@
#define _ST_H
#include <linux/completion.h>
#define _ST_H
#include <linux/completion.h>
-
+#include <linux/kref.h>
+#include <scsi/scsi_cmnd.h>
/* Descriptor for analyzed sense data */
struct st_cmdstatus {
/* Descriptor for analyzed sense data */
struct st_cmdstatus {
@@
-17,6
+18,17
@@
struct st_cmdstatus {
u8 deferred;
};
u8 deferred;
};
+struct scsi_tape;
+
+/* scsi tape command */
+struct st_request {
+ unsigned char cmd[MAX_COMMAND_SIZE];
+ unsigned char sense[SCSI_SENSE_BUFFERSIZE];
+ int result;
+ struct scsi_tape *stp;
+ struct completion *waiting;
+};
+
/* The tape buffer descriptor. */
struct st_buffer {
unsigned char in_use;
/* The tape buffer descriptor. */
struct st_buffer {
unsigned char in_use;
@@
-28,7
+40,7
@@
struct st_buffer {
int read_pointer;
int writing;
int syscall_result;
int read_pointer;
int writing;
int syscall_result;
- struct s
csi
_request *last_SRpnt;
+ struct s
t
_request *last_SRpnt;
struct st_cmdstatus cmdstat;
unsigned char *b_data;
unsigned short use_sg; /* zero or max number of s/g segments for this adapter */
struct st_cmdstatus cmdstat;
unsigned char *b_data;
unsigned short use_sg; /* zero or max number of s/g segments for this adapter */
@@
-156,6
+168,7
@@
struct scsi_tape {
unsigned char last_sense[16];
#endif
struct gendisk *disk;
unsigned char last_sense[16];
#endif
struct gendisk *disk;
+ struct kref kref;
};
/* Bit masks for use_pf */
};
/* Bit masks for use_pf */