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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
scsi
/
scsi_device.h
diff --git
a/include/scsi/scsi_device.h
b/include/scsi/scsi_device.h
index
895d212
..
290e3b4
100644
(file)
--- a/
include/scsi/scsi_device.h
+++ b/
include/scsi/scsi_device.h
@@
-4,7
+4,6
@@
#include <linux/device.h>
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/device.h>
#include <linux/list.h>
#include <linux/spinlock.h>
-#include <linux/workqueue.h>
#include <asm/atomic.h>
struct request_queue;
#include <asm/atomic.h>
struct request_queue;
@@
-74,6
+73,7
@@
struct scsi_device {
unsigned sector_size; /* size in bytes */
void *hostdata; /* available to low-level driver */
unsigned sector_size; /* size in bytes */
void *hostdata; /* available to low-level driver */
+ char devfs_name[256]; /* devfs junk */
char type;
char scsi_level;
char inq_periph_qual; /* PQ from INQUIRY data */
char type;
char scsi_level;
char inq_periph_qual; /* PQ from INQUIRY data */
@@
-138,8
+138,6
@@
struct scsi_device {
struct device sdev_gendev;
struct class_device sdev_classdev;
struct device sdev_gendev;
struct class_device sdev_classdev;
- struct execute_work ew; /* used to get process context on put */
-
enum scsi_device_state sdev_state;
unsigned long sdev_data[0];
} __attribute__((aligned(sizeof(unsigned long))));
enum scsi_device_state sdev_state;
unsigned long sdev_data[0];
} __attribute__((aligned(sizeof(unsigned long))));
@@
-156,11
+154,6
@@
struct scsi_device {
#define scmd_printk(prefix, scmd, fmt, a...) \
dev_printk(prefix, &(scmd)->device->sdev_gendev, fmt, ##a)
#define scmd_printk(prefix, scmd, fmt, a...) \
dev_printk(prefix, &(scmd)->device->sdev_gendev, fmt, ##a)
-enum scsi_target_state {
- STARGET_RUNNING = 1,
- STARGET_DEL,
-};
-
/*
* scsi_target: representation of a scsi target, for now, this is only
* used for single_lun devices. If no one has active IO to the target,
/*
* scsi_target: representation of a scsi target, for now, this is only
* used for single_lun devices. If no one has active IO to the target,
@@
-175,13
+168,8
@@
struct scsi_target {
unsigned int channel;
unsigned int id; /* target id ... replace
* scsi_device.id eventually */
unsigned int channel;
unsigned int id; /* target id ... replace
* scsi_device.id eventually */
- unsigned int create:1; /* signal that it needs to be added */
- unsigned int pdt_1f_for_no_lun; /* PDT = 0x1f */
- /* means no lun present */
-
+ unsigned long create:1; /* signal that it needs to be added */
char scsi_level;
char scsi_level;
- struct execute_work ew;
- enum scsi_target_state state;
void *hostdata; /* available to low-level driver */
unsigned long starget_data[0]; /* for the transport */
/* starget_data must be the last element!!!! */
void *hostdata; /* available to low-level driver */
unsigned long starget_data[0]; /* for the transport */
/* starget_data must be the last element!!!! */
@@
-261,11
+249,6
@@
extern int scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
unsigned char *buffer, int len, int timeout,
int retries, struct scsi_mode_data *data,
struct scsi_sense_hdr *);
unsigned char *buffer, int len, int timeout,
int retries, struct scsi_mode_data *data,
struct scsi_sense_hdr *);
-extern int scsi_mode_select(struct scsi_device *sdev, int pf, int sp,
- int modepage, unsigned char *buffer, int len,
- int timeout, int retries,
- struct scsi_mode_data *data,
- struct scsi_sense_hdr *);
extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout,
int retries);
extern int scsi_device_set_state(struct scsi_device *sdev,
extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout,
int retries);
extern int scsi_device_set_state(struct scsi_device *sdev,
@@
-298,11
+281,6
@@
extern int scsi_execute_async(struct scsi_device *sdev,
void (*done)(void *, char *, int, int),
gfp_t gfp);
void (*done)(void *, char *, int, int),
gfp_t gfp);
-static inline void scsi_device_reprobe(struct scsi_device *sdev)
-{
- device_reprobe(&sdev->sdev_gendev);
-}
-
static inline unsigned int sdev_channel(struct scsi_device *sdev)
{
return sdev->channel;
static inline unsigned int sdev_channel(struct scsi_device *sdev)
{
return sdev->channel;