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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
scsi
/
scsi_transport_iscsi.h
diff --git
a/include/scsi/scsi_transport_iscsi.h
b/include/scsi/scsi_transport_iscsi.h
index
39e8332
..
d5c218d
100644
(file)
--- a/
include/scsi/scsi_transport_iscsi.h
+++ b/
include/scsi/scsi_transport_iscsi.h
@@
-29,7
+29,6
@@
struct scsi_transport_template;
struct iscsi_transport;
struct Scsi_Host;
struct scsi_transport_template;
struct iscsi_transport;
struct Scsi_Host;
-struct mempool_zone;
struct iscsi_cls_conn;
struct iscsi_conn;
struct iscsi_cmd_task;
struct iscsi_cls_conn;
struct iscsi_conn;
struct iscsi_cmd_task;
@@
-157,9
+156,6
@@
struct iscsi_cls_conn {
int active; /* must be accessed with the connlock */
struct device dev; /* sysfs transport/container device */
int active; /* must be accessed with the connlock */
struct device dev; /* sysfs transport/container device */
- struct mempool_zone *z_error;
- struct mempool_zone *z_pdu;
- struct list_head freequeue;
};
#define iscsi_dev_to_conn(_dev) \
};
#define iscsi_dev_to_conn(_dev) \
@@
-180,7
+176,7
@@
struct iscsi_cls_session {
/* recovery fields */
int recovery_tmo;
/* recovery fields */
int recovery_tmo;
- struct
work_struct
recovery_work;
+ struct
delayed_work
recovery_work;
int target_id;
int target_id;