mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-19 19:51:27 +00:00
Merged revision 5741 from iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x-iser@5742 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -63,8 +63,8 @@ struct iscsit_transport {
|
||||
struct list_head transport_list_entry;
|
||||
} ____cacheline_aligned;
|
||||
|
||||
extern int iscsit_register_transport(struct iscsit_transport *t);
|
||||
extern void iscsit_unregister_transport(struct iscsit_transport *t);
|
||||
extern int iscsit_reg_transport(struct iscsit_transport *t);
|
||||
extern void iscsit_unreg_transport(struct iscsit_transport *t);
|
||||
extern struct iscsit_transport *iscsit_get_transport(enum iscsit_transport_type type);
|
||||
|
||||
#endif /* __ISCSI_TRANSPORT_H__ */
|
||||
|
||||
@@ -4247,7 +4247,7 @@ static int __init iscsi_init(void)
|
||||
|
||||
PRINT_INFO("iSCSI SCST Target - version %s", ISCSI_VERSION_STRING);
|
||||
|
||||
err = iscsit_register_transport(&iscsi_tcp_transport);
|
||||
err = iscsit_reg_transport(&iscsi_tcp_transport);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
@@ -4401,7 +4401,7 @@ static void __exit iscsi_exit(void)
|
||||
|
||||
scst_unregister_target_template(&iscsi_template);
|
||||
|
||||
iscsit_unregister_transport(&iscsi_tcp_transport);
|
||||
iscsit_unreg_transport(&iscsi_tcp_transport);
|
||||
|
||||
#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
|
||||
net_set_get_put_page_callbacks(NULL, NULL);
|
||||
|
||||
@@ -29,7 +29,7 @@ struct iscsit_transport *iscsit_get_transport(enum iscsit_transport_type type)
|
||||
return t;
|
||||
}
|
||||
|
||||
int iscsit_register_transport(struct iscsit_transport *t)
|
||||
int iscsit_reg_transport(struct iscsit_transport *t)
|
||||
{
|
||||
struct iscsit_transport *tmp;
|
||||
int ret = 0;
|
||||
@@ -50,9 +50,9 @@ int iscsit_register_transport(struct iscsit_transport *t)
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(iscsit_register_transport);
|
||||
EXPORT_SYMBOL(iscsit_reg_transport);
|
||||
|
||||
void iscsit_unregister_transport(struct iscsit_transport *t)
|
||||
void iscsit_unreg_transport(struct iscsit_transport *t)
|
||||
{
|
||||
mutex_lock(&transport_mutex);
|
||||
list_del(&t->transport_list_entry);
|
||||
@@ -60,5 +60,5 @@ void iscsit_unregister_transport(struct iscsit_transport *t)
|
||||
|
||||
PRINT_INFO("Unregistered iSCSI transport: %s\n", t->name);
|
||||
}
|
||||
EXPORT_SYMBOL(iscsit_unregister_transport);
|
||||
EXPORT_SYMBOL(iscsit_unreg_transport);
|
||||
|
||||
|
||||
@@ -470,7 +470,7 @@ static struct iscsit_transport isert_transport = {
|
||||
|
||||
static void isert_cleanup_module(void)
|
||||
{
|
||||
iscsit_unregister_transport(&isert_transport);
|
||||
iscsit_unreg_transport(&isert_transport);
|
||||
isert_cleanup_login_devs();
|
||||
}
|
||||
|
||||
@@ -478,7 +478,7 @@ static int __init isert_init_module(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = iscsit_register_transport(&isert_transport);
|
||||
ret = iscsit_reg_transport(&isert_transport);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user