Merge tag 'v3.13-rc4' into core/locking

Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

4 files changed, 49 insertions, 43 deletions

diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index 5ebe21cd5d1c..39e0114d70c5 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -34,6 +34,11 @@ struct se_subsystem_api {
         sense_reason_t (*parse_cdb)(struct se_cmd *cmd);
         u32 (*get_device_type)(struct se_device *);
         sector_t (*get_blocks)(struct se_device *);
+        sector_t (*get_alignment_offset_lbas)(struct se_device *);
+        /* lbppbe = logical blocks per physical block exponent. see SBC-3 */
+        unsigned int (*get_lbppbe)(struct se_device *);
+        unsigned int (*get_io_min)(struct se_device *);
+        unsigned int (*get_io_opt)(struct se_device *);
         unsigned char *(*get_sense_buffer)(struct se_cmd *);
         bool (*get_write_cache)(struct se_device *);
 };
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 5bdb8b7d2a69..45412a6afa69 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -227,6 +227,7 @@ enum tcm_tmreq_table {
 
 /* fabric independent task management response values */
 enum tcm_tmrsp_table {
+        TMR_FUNCTION_FAILED             = 0,
         TMR_FUNCTION_COMPLETE           = 1,
         TMR_TASK_DOES_NOT_EXIST         = 2,
         TMR_LUN_DOES_NOT_EXIST          = 3,
@@ -282,11 +283,12 @@ struct t10_alua_lu_gp_member {
 struct t10_alua_tg_pt_gp {
         u16     tg_pt_gp_id;
         int     tg_pt_gp_valid_id;
+        int     tg_pt_gp_alua_supported_states;
         int     tg_pt_gp_alua_access_status;
         int     tg_pt_gp_alua_access_type;
         int     tg_pt_gp_nonop_delay_msecs;
         int     tg_pt_gp_trans_delay_msecs;
-        int     tg_pt_gp_implict_trans_secs;
+        int     tg_pt_gp_implicit_trans_secs;
         int     tg_pt_gp_pref;
         int     tg_pt_gp_write_metadata;
         /* Used by struct t10_alua_tg_pt_gp->tg_pt_gp_md_buf_len */
@@ -442,7 +444,6 @@ struct se_cmd {
         /* Used for sense data */
         void                    *sense_buffer;
         struct list_head        se_delayed_node;
-        struct list_head        se_lun_node;
         struct list_head        se_qf_node;
         struct se_device      *se_dev;
         struct se_dev_entry   *se_deve;
@@ -470,15 +471,11 @@ struct se_cmd {
 #define CMD_T_SENT              (1 << 4)
 #define CMD_T_STOP              (1 << 5)
 #define CMD_T_FAILED            (1 << 6)
-#define CMD_T_LUN_STOP          (1 << 7)
-#define CMD_T_LUN_FE_STOP       (1 << 8)
-#define CMD_T_DEV_ACTIVE        (1 << 9)
-#define CMD_T_REQUEST_STOP      (1 << 10)
-#define CMD_T_BUSY              (1 << 11)
+#define CMD_T_DEV_ACTIVE        (1 << 7)
+#define CMD_T_REQUEST_STOP      (1 << 8)
+#define CMD_T_BUSY              (1 << 9)
         spinlock_t              t_state_lock;
         struct completion       t_transport_stop_comp;
-        struct completion       transport_lun_fe_stop_comp;
-        struct completion       transport_lun_stop_comp;
 
         struct work_struct      work;
 
@@ -498,6 +495,9 @@ struct se_cmd {
 
         /* backend private data */
         void                    *priv;
+
+        /* Used for lun->lun_ref counting */
+        bool                    lun_ref_active;
 };
 
 struct se_ua {
@@ -628,6 +628,34 @@ struct se_dev_attrib {
         struct config_group da_group;
 };
 
+struct se_port_stat_grps {
+        struct config_group stat_group;
+        struct config_group scsi_port_group;
+        struct config_group scsi_tgt_port_group;
+        struct config_group scsi_transport_group;
+};
+
+struct se_lun {
+#define SE_LUN_LINK_MAGIC                       0xffff7771
+        u32                     lun_link_magic;
+        /* See transport_lun_status_table */
+        enum transport_lun_status_table lun_status;
+        u32                     lun_access;
+        u32                     lun_flags;
+        u32                     unpacked_lun;
+        atomic_t                lun_acl_count;
+        spinlock_t              lun_acl_lock;
+        spinlock_t              lun_sep_lock;
+        struct completion       lun_shutdown_comp;
+        struct list_head        lun_acl_list;
+        struct se_device        *lun_se_dev;
+        struct se_port          *lun_sep;
+        struct config_group     lun_group;
+        struct se_port_stat_grps port_stat_grps;
+        struct completion       lun_ref_comp;
+        struct percpu_ref       lun_ref;
+};
+
 struct se_dev_stat_grps {
         struct config_group stat_group;
         struct config_group scsi_dev_group;
@@ -656,11 +684,10 @@ struct se_device {
         /* Pointer to transport specific device structure */
         u32                     dev_index;
         u64                     creation_time;
-        u32                     num_resets;
-        u64                     num_cmds;
-        u64                     read_bytes;
-        u64                     write_bytes;
-        spinlock_t              stats_lock;
+        atomic_long_t           num_resets;
+        atomic_long_t           num_cmds;
+        atomic_long_t           read_bytes;
+        atomic_long_t           write_bytes;
         /* Active commands on this virtual SE device */
         atomic_t                simple_cmds;
         atomic_t                dev_ordered_id;
@@ -711,6 +738,7 @@ struct se_device {
         struct se_subsystem_api *transport;
         /* Linked list for struct se_hba struct se_device list */
         struct list_head        dev_list;
+        struct se_lun           xcopy_lun;
 };
 
 struct se_hba {
@@ -730,34 +758,6 @@ struct se_hba {
         struct se_subsystem_api *transport;
 };
 
-struct se_port_stat_grps {
-        struct config_group stat_group;
-        struct config_group scsi_port_group;
-        struct config_group scsi_tgt_port_group;
-        struct config_group scsi_transport_group;
-};
-
-struct se_lun {
-#define SE_LUN_LINK_MAGIC                       0xffff7771
-        u32                     lun_link_magic;
-        /* See transport_lun_status_table */
-        enum transport_lun_status_table lun_status;
-        u32                     lun_access;
-        u32                     lun_flags;
-        u32                     unpacked_lun;
-        atomic_t                lun_acl_count;
-        spinlock_t              lun_acl_lock;
-        spinlock_t              lun_cmd_lock;
-        spinlock_t              lun_sep_lock;
-        struct completion       lun_shutdown_comp;
-        struct list_head        lun_cmd_list;
-        struct list_head        lun_acl_list;
-        struct se_device        *lun_se_dev;
-        struct se_port          *lun_sep;
-        struct config_group     lun_group;
-        struct se_port_stat_grps port_stat_grps;
-};
-
 struct scsi_port_stats {
        u64     cmd_pdus;
        u64     tx_data_octets;
diff --git a/include/target/target_core_configfs.h b/include/target/target_core_configfs.h
index 713c5004f4ae..e0801386e4dc 100644
--- a/include/target/target_core_configfs.h
+++ b/include/target/target_core_configfs.h
@@ -54,4 +54,3 @@ struct target_fabric_configfs {
         struct target_fabric_configfs_template tf_cit_tmpl;
 };
 
-#define TF_CIT_TMPL(tf) (&(tf)->tf_cit_tmpl)
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 882b650e32be..4cf4fda404a3 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -137,6 +137,8 @@ void	transport_generic_request_failure(struct se_cmd *, sense_reason_t);
 void    __target_execute_cmd(struct se_cmd *);
 int     transport_lookup_tmr_lun(struct se_cmd *, u32);
 
+struct se_node_acl *core_tpg_get_initiator_node_acl(struct se_portal_group *tpg,
+                unsigned char *);
 struct se_node_acl *core_tpg_check_initiator_node_acl(struct se_portal_group *,
                 unsigned char *);
 void    core_tpg_clear_object_luns(struct se_portal_group *);