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]
/
drivers
/
infiniband
/
ulp
/
srp
/
ib_srp.h
diff --git
a/drivers/infiniband/ulp/srp/ib_srp.h
b/drivers/infiniband/ulp/srp/ib_srp.h
index
c5cd43a
..
4e7727d
100644
(file)
--- a/
drivers/infiniband/ulp/srp/ib_srp.h
+++ b/
drivers/infiniband/ulp/srp/ib_srp.h
@@
-38,7
+38,6
@@
#include <linux/types.h>
#include <linux/list.h>
#include <linux/mutex.h>
#include <linux/types.h>
#include <linux/list.h>
#include <linux/mutex.h>
-#include <linux/scatterlist.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
@@
-95,13
+94,9
@@
struct srp_request {
struct scsi_cmnd *scmnd;
struct srp_iu *cmd;
struct srp_iu *tsk_mgmt;
struct scsi_cmnd *scmnd;
struct srp_iu *cmd;
struct srp_iu *tsk_mgmt;
- /*
- * Fake scatterlist used when scmnd->use_sg==0. Can be killed
- * when the SCSI midlayer no longer generates non-SG commands.
- */
- struct scatterlist fake_sg;
+ DECLARE_PCI_UNMAP_ADDR(direct_mapping)
struct completion done;
struct completion done;
- short
index
;
+ short
next
;
u8 cmd_done;
u8 tsk_status;
};
u8 cmd_done;
u8 tsk_status;
};
@@
-133,7
+128,7
@@
struct srp_target_port {
unsigned tx_tail;
struct srp_iu *tx_ring[SRP_SQ_SIZE + 1];
unsigned tx_tail;
struct srp_iu *tx_ring[SRP_SQ_SIZE + 1];
-
struct list_head free_reqs
;
+
int req_head
;
struct list_head req_queue;
struct srp_request req_ring[SRP_SQ_SIZE];
struct list_head req_queue;
struct srp_request req_ring[SRP_SQ_SIZE];