scsi: target: Introduce transport_init_session()

Other than initializing xcopy_pt_sess.sess_wait_list, this patch does not
change any functionality.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Mike Christie <mchristi@redhat.com>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 880e07f40099ed34159184c8424bd973df108b4b..595b2f12ca6a79ee125373b6e60c6d80ad93e58c 100644 (file)
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -224,6 +224,22 @@ void transport_subsystem_check_init(void)
        sub_api_initialized = 1;
 }
 
+/**
+ * transport_init_session - initialize a session object
+ * @se_sess: Session object pointer.
+ *
+ * The caller must have zero-initialized @se_sess before calling this function.
+ */
+void transport_init_session(struct se_session *se_sess)
+{
+       INIT_LIST_HEAD(&se_sess->sess_list);
+       INIT_LIST_HEAD(&se_sess->sess_acl_list);
+       INIT_LIST_HEAD(&se_sess->sess_cmd_list);
+       INIT_LIST_HEAD(&se_sess->sess_wait_list);
+       spin_lock_init(&se_sess->sess_cmd_lock);
+}
+EXPORT_SYMBOL(transport_init_session);
+
 /**
  * transport_alloc_session - allocate a session object and initialize it
  * @sup_prot_ops: bitmask that defines which T10-PI modes are supported.
@@ -238,11 +254,7 @@ struct se_session *transport_alloc_session(enum target_prot_op sup_prot_ops)
                                " se_sess_cache\n");
                return ERR_PTR(-ENOMEM);
        }
-       INIT_LIST_HEAD(&se_sess->sess_list);
-       INIT_LIST_HEAD(&se_sess->sess_acl_list);
-       INIT_LIST_HEAD(&se_sess->sess_cmd_list);
-       INIT_LIST_HEAD(&se_sess->sess_wait_list);
-       spin_lock_init(&se_sess->sess_cmd_lock);
+       transport_init_session(se_sess);
        se_sess->sup_prot_ops = sup_prot_ops;
 
        return se_sess;

diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c
index 9ee89e00cd77669922d8223f8a38f0a0a2cdf949..2718a933c0c6e13146d059aeb6a44ca50e8594b1 100644 (file)
--- a/drivers/target/target_core_xcopy.c
+++ b/drivers/target/target_core_xcopy.c
@@ -497,10 +497,7 @@ int target_xcopy_setup_pt(void)
        INIT_LIST_HEAD(&xcopy_pt_nacl.acl_list);
        INIT_LIST_HEAD(&xcopy_pt_nacl.acl_sess_list);
        memset(&xcopy_pt_sess, 0, sizeof(struct se_session));
-       INIT_LIST_HEAD(&xcopy_pt_sess.sess_list);
-       INIT_LIST_HEAD(&xcopy_pt_sess.sess_acl_list);
-       INIT_LIST_HEAD(&xcopy_pt_sess.sess_cmd_list);
-       spin_lock_init(&xcopy_pt_sess.sess_cmd_lock);
+       transport_init_session(&xcopy_pt_sess);
 
        xcopy_pt_nacl.se_tpg = &xcopy_pt_tpg;
        xcopy_pt_nacl.nacl_sess = &xcopy_pt_sess;

diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 010df9d5b97714a1459c5a1ea207e64fce0ef3c8..84a681b6e5cac754b15dc8726e4c770a3fedff11 100644 (file)
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -115,6 +115,7 @@ struct se_session *target_alloc_session(struct se_portal_group *,
                int (*callback)(struct se_portal_group *,
                                struct se_session *, void *));
 
+void transport_init_session(struct se_session *);
 struct se_session *transport_alloc_session(enum target_prot_op);
 int transport_alloc_session_tags(struct se_session *, unsigned int,
                unsigned int);