aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/osst.h
diff options
context:
space:
mode:
authorWillem Riede <osst@riede.org>2006-02-11 14:46:56 -0500
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-07 10:16:01 -0500
commit5e6575c051f3313feb9fe1aad61263b3560df5cc (patch)
treee8bfe9b9670ff782f1d27707689edf69761785f3 /drivers/scsi/osst.h
parent286fc8f8ea7ef58b54f150fc900ce019af483e89 (diff)
[SCSI] osst: changes required to move forward to block request
On 02/07/2006 04:12:55 AM, Christoph Hellwig wrote: > On Mon, Feb 06, 2006 at 08:02:21PM -0500, Willem Riede wrote: > > > But I will certainly help retire scsi_request. And anything else that is > > needed to keep up with proper kernel style. Let me know what those are, if > > you would? I'll start looking at how st has changed, and will be back with > > any questions I may have. > > right now the above is the most urgent bit. What would be nice but not > required is a conversion to the sense handling helpers, similar to what > st got (aka using the *normalize_sense functions and then dealing with the > parsed sense buffer instead of the raw sense data) Ok, so here is my first take at satisfying this request. Be warned, that beyond compiling, and checking that the new module doesn't immediately blow up, there hasn't yet been a lot of testing. But this should allow you to comment on the changes, and move forward with dropping scsi_request from the kernel code. Signed-off-by: Willem Riede <osst@riede.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/osst.h')
-rw-r--r--drivers/scsi/osst.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h
index b72e1c76f52c..011d4d6ca9f9 100644
--- a/drivers/scsi/osst.h
+++ b/drivers/scsi/osst.h
@@ -518,7 +518,8 @@ struct osst_buffer {
518 int writing; 518 int writing;
519 int midlevel_result; 519 int midlevel_result;
520 int syscall_result; 520 int syscall_result;
521 struct scsi_request *last_SRpnt; 521 struct osst_request *last_SRpnt;
522 struct st_cmdstatus cmdstat;
522 unsigned char *b_data; 523 unsigned char *b_data;
523 os_aux_t *aux; /* onstream AUX structure at end of each block */ 524 os_aux_t *aux; /* onstream AUX structure at end of each block */
524 unsigned short use_sg; /* zero or number of s/g segments for this adapter */ 525 unsigned short use_sg; /* zero or number of s/g segments for this adapter */
@@ -626,6 +627,15 @@ struct osst_tape {
626 struct gendisk *drive; 627 struct gendisk *drive;
627} ; 628} ;
628 629
630/* scsi tape command */
631struct osst_request {
632 unsigned char cmd[MAX_COMMAND_SIZE];
633 unsigned char sense[SCSI_SENSE_BUFFERSIZE];
634 int result;
635 struct osst_tape *stp;
636 struct completion *waiting;
637};
638
629/* Values of write_type */ 639/* Values of write_type */
630#define OS_WRITE_DATA 0 640#define OS_WRITE_DATA 0
631#define OS_WRITE_EOD 1 641#define OS_WRITE_EOD 1