Merge commit 'v3.3-rc6' into next

5 files changed, 13 insertions, 3 deletions

diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 5d1a758e0595..6a3922fe0be0 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -857,7 +857,7 @@ struct fc_lport {
         enum fc_lport_state            state;
         unsigned long                  boot_time;
         struct fc_host_statistics      host_stats;
-        struct fcoe_dev_stats          *dev_stats;
+        struct fcoe_dev_stats __percpu *dev_stats;
         u8                             retry_count;
 
         /* Fabric information */
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index d1e95c6ac776..5a35a2a2d3c5 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -147,6 +147,7 @@ struct fcoe_ctlr {
         u8 map_dest;
         u8 spma;
         u8 probe_tries;
+        u8 priority;
         u8 dest_addr[ETH_ALEN];
         u8 ctl_src_addr[ETH_ALEN];
 
@@ -301,6 +302,7 @@ struct fcoe_percpu_s {
  * @lport:                     The associated local port
  * @fcoe_pending_queue:        The pending Rx queue of skbs
  * @fcoe_pending_queue_active: Indicates if the pending queue is active
+ * @priority:                  Packet priority (DCB)
  * @max_queue_depth:           Max queue depth of pending queue
  * @min_queue_depth:           Min queue depth of pending queue
  * @timer:                     The queue timer
@@ -316,6 +318,7 @@ struct fcoe_port {
         struct fc_lport       *lport;
         struct sk_buff_head   fcoe_pending_queue;
         u8                    fcoe_pending_queue_active;
+        u8                    priority;
         u32                   max_queue_depth;
         u32                   min_queue_depth;
         struct timer_list     timer;
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 5591ed54dc93..77273f2fdd80 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -185,7 +185,6 @@ typedef void (*activate_complete)(void *, int);
 struct scsi_device_handler {
         /* Used by the infrastructure */
         struct list_head list; /* list of scsi_device_handlers */
-        int idx;
 
         /* Filled by the hardware handler */
         struct module *module;
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 50266c9405fc..5f7d5b3b1c6e 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -669,6 +669,9 @@ struct Scsi_Host {
         /* Asynchronous scan in progress */
         unsigned async_scan:1;
 
+        /* Don't resume host in EH */
+        unsigned eh_noresume:1;
+
         /*
          * Optional work queue to be utilized by the transport
          */
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 5994bcc1b017..2c3a46d102fd 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -142,7 +142,7 @@ struct iscsi_transport {
         int (*get_iface_param) (struct iscsi_iface *iface,
                                 enum iscsi_param_type param_type,
                                 int param, char *buf);
-        mode_t (*attr_is_visible)(int param_type, int param);
+        umode_t (*attr_is_visible)(int param_type, int param);
         int (*bsg_request)(struct bsg_job *job);
 };
 
@@ -211,6 +211,11 @@ struct iscsi_cls_session {
         unsigned int target_id;
         bool ida_used;
 
+        /*
+         * pid of userspace process that created session or -1 if
+         * created by the kernel.
+         */
+        pid_t creator;
         int state;
         int sid;                                /* session id */
         void *dd_data;                          /* LLD private data */