3 files changed, 11 insertions, 4 deletions

diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index f415f89e0ac..102dc096e1c 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -53,15 +53,19 @@ struct bsg_class_device {
         struct class_device *class_dev;
         struct device *dev;
         int minor;
-        struct list_head list;
         struct request_queue *queue;
 };
 
 extern int bsg_register_queue(struct request_queue *, struct device *, const char *);
 extern void bsg_unregister_queue(struct request_queue *);
 #else
-#define bsg_register_queue(disk, dev, name)             (0)
-#define bsg_unregister_queue(disk)      do { } while (0)
+static inline int bsg_register_queue(struct request_queue * rq, struct device *dev, const char *name)
+{
+        return 0;
+}
+static inline void bsg_unregister_queue(struct request_queue *rq)
+{
+}
 #endif
 
 #endif /* __KERNEL__ */
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 3f631b08a1a..007d442412e 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -210,6 +210,9 @@ struct iscsi_session {
         uint32_t                exp_cmdsn;
         uint32_t                max_cmdsn;
 
+        /* This tracks the reqs queued into the initiator */
+        uint32_t                queued_cmdsn;
+
         /* configuration */
         int                     initial_r2t_en;
         unsigned                max_r2t;
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index df36461fe88..8dda2d66b5b 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -348,7 +348,7 @@ struct sas_ha_struct {
 
 /* public: */
         char *sas_ha_name;
-        struct pci_dev *pcidev;   /* should be set */
+        struct device *dev;       /* should be set */
         struct module *lldd_module; /* should be set */
 
         u8 *sas_addr;             /* must be set */