Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
drivers/target/iscsi/iscsi_target.c | 2 +-
drivers/target/iscsi/iscsi_target.h | 5 +++++
drivers/target/iscsi/iscsi_target_configfs.c | 10 +++++-----
drivers/target/iscsi/iscsi_target_erl0.c | 8 ++++----
drivers/target/iscsi/iscsi_target_erl2.c | 4 +---
drivers/target/iscsi/iscsi_target_login.c | 4 ----
drivers/target/iscsi/iscsi_target_nego.c | 2 +-
drivers/target/iscsi/iscsi_target_tmr.c | 6 +++---
drivers/target/iscsi/iscsi_target_tq.c | 6 +++---
drivers/target/iscsi/iscsi_target_tq.h | 1 -
10 files changed, 23 insertions(+), 25 deletions(-)
Index: lio-core/drivers/target/iscsi/iscsi_target.c
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target.c 2012-09-25 11:12:43.000000000 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target.c 2012-09-26 10:39:43.732450226 +0200
@@ -427,7 +427,7 @@ int iscsit_reset_np_thread(
return 0;
}
-int iscsit_del_np_comm(struct iscsi_np *np)
+static int iscsit_del_np_comm(struct iscsi_np *np)
{
if (np->np_socket)
sock_release(np->np_socket);
Index: lio-core/drivers/target/iscsi/iscsi_target.h
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target.h 2012-07-08 20:25:56.759950442 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target.h 2012-09-26 10:39:43.732450226 +0200
@@ -38,4 +38,9 @@ extern struct kmem_cache *lio_cmd_cache;
extern struct kmem_cache *lio_qr_cache;
extern struct kmem_cache *lio_r2t_cache;
+extern struct idr sess_idr;
+extern struct mutex auth_id_lock;
+extern spinlock_t sess_idr_lock;
+
+
#endif /*** ISCSI_TARGET_H ***/
Index: lio-core/drivers/target/iscsi/iscsi_target_configfs.c
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target_configfs.c 2012-09-25 11:12:43.948027558 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target_configfs.c 2012-09-26 10:39:43.736450228 +0200
@@ -135,7 +135,7 @@ static struct configfs_attribute *lio_ta
#define MAX_PORTAL_LEN 256
-struct se_tpg_np *lio_target_call_addnptotpg(
+static struct se_tpg_np *lio_target_call_addnptotpg(
struct se_portal_group *se_tpg,
struct config_group *group,
const char *name)
@@ -1166,7 +1166,7 @@ static struct configfs_attribute *lio_ta
/* Start items for lio_target_tiqn_cit */
-struct se_portal_group *lio_target_tiqn_addtpg(
+static struct se_portal_group *lio_target_tiqn_addtpg(
struct se_wwn *wwn,
struct config_group *group,
const char *name)
@@ -1216,7 +1216,7 @@ out:
return NULL;
}
-void lio_target_tiqn_deltpg(struct se_portal_group *se_tpg)
+static void lio_target_tiqn_deltpg(struct se_portal_group *se_tpg)
{
struct iscsi_portal_group *tpg;
struct iscsi_tiqn *tiqn;
@@ -1248,7 +1248,7 @@ static struct configfs_attribute *lio_ta
NULL,
};
-struct se_wwn *lio_target_call_coreaddtiqn(
+static struct se_wwn *lio_target_call_coreaddtiqn(
struct target_fabric_configfs *tf,
struct config_group *group,
const char *name)
@@ -1296,7 +1296,7 @@ struct se_wwn *lio_target_call_coreaddti
return &tiqn->tiqn_wwn;
}
-void lio_target_call_coredeltiqn(
+static void lio_target_call_coredeltiqn(
struct se_wwn *wwn)
{
struct iscsi_tiqn *tiqn = container_of(wwn, struct iscsi_tiqn, tiqn_wwn);
Index: lio-core/drivers/target/iscsi/iscsi_target_erl0.c
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target_erl0.c 2012-07-08 20:25:56.759950442 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target_erl0.c 2012-09-26 10:39:43.740450229 +0200
@@ -685,7 +685,7 @@ recover:
* Called from iscsit_handle_data_out() before DataOUT Payload is received
* and CRC computed.
*/
-extern int iscsit_check_pre_dataout(
+int iscsit_check_pre_dataout(
struct iscsi_cmd *cmd,
unsigned char *buf)
{
@@ -789,7 +789,7 @@ static void iscsit_handle_time2retain_ti
target_put_session(sess->se_sess);
}
-extern void iscsit_start_time2retain_handler(struct iscsi_session *sess)
+void iscsit_start_time2retain_handler(struct iscsi_session *sess)
{
int tpg_active;
/*
@@ -822,7 +822,7 @@ extern void iscsit_start_time2retain_han
/*
* Called with spin_lock_bh(&struct se_portal_group->session_lock) held
*/
-extern int iscsit_stop_time2retain_timer(struct iscsi_session *sess)
+int iscsit_stop_time2retain_timer(struct iscsi_session *sess)
{
struct iscsi_portal_group *tpg = ISCSI_TPG_S(sess);
struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
@@ -926,7 +926,7 @@ static void iscsit_handle_connection_cle
}
}
-extern void iscsit_take_action_for_connection_exit(struct iscsi_conn *conn)
+void iscsit_take_action_for_connection_exit(struct iscsi_conn *conn)
{
spin_lock_bh(&conn->state_lock);
if (atomic_read(&conn->connection_exit)) {
Index: lio-core/drivers/target/iscsi/iscsi_target_erl2.c
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target_erl2.c 2012-07-08 20:25:56.759950442 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target_erl2.c 2012-09-26 10:39:43.740450229 +0200
@@ -193,15 +193,13 @@ int iscsit_remove_active_connection_reco
return 0;
}
-int iscsit_remove_inactive_connection_recovery_entry(
+static void iscsit_remove_inactive_connection_recovery_entry(
struct iscsi_conn_recovery *cr,
struct iscsi_session *sess)
{
spin_lock(&sess->cr_i_lock);
list_del(&cr->cr_list);
spin_unlock(&sess->cr_i_lock);
-
- return 0;
}
/*
Index: lio-core/drivers/target/iscsi/iscsi_target_login.c
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target_login.c 2012-09-25 11:12:43.948027558 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target_login.c 2012-09-26 10:39:43.744450229 +0200
@@ -39,10 +39,6 @@
#include "iscsi_target.h"
#include "iscsi_target_parameters.h"
-extern struct idr sess_idr;
-extern struct mutex auth_id_lock;
-extern spinlock_t sess_idr_lock;
-
static int iscsi_login_init_conn(struct iscsi_conn *conn)
{
INIT_LIST_HEAD(&conn->conn_list);
Index: lio-core/drivers/target/iscsi/iscsi_target_nego.c
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target_nego.c 2012-09-25 11:12:43.951360891 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target_nego.c 2012-09-26 10:39:43.748450228 +0200
@@ -44,7 +44,7 @@ void convert_null_to_semi(char *buf, int
buf[i] = ';';
}
-int strlen_semi(char *buf)
+static int strlen_semi(char *buf)
{
int i = 0;
Index: lio-core/drivers/target/iscsi/iscsi_target_tmr.c
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target_tmr.c 2012-07-22 06:59:02.000000000 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target_tmr.c 2012-09-26 10:39:43.748450228 +0200
@@ -455,7 +455,7 @@ static int iscsit_task_reassign_complete
* Right now the only one that its really needed for is
* connection recovery releated TASK_REASSIGN.
*/
-extern int iscsit_tmr_post_handler(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
+int iscsit_tmr_post_handler(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
{
struct iscsi_tmr_req *tmr_req = cmd->tmr_req;
struct se_tmr_req *se_tmr = cmd->se_cmd.se_tmr_req;
@@ -470,7 +470,7 @@ extern int iscsit_tmr_post_handler(struc
/*
* Nothing to do here, but leave it for good measure. :-)
*/
-int iscsit_task_reassign_prepare_read(
+static int iscsit_task_reassign_prepare_read(
struct iscsi_tmr_req *tmr_req,
struct iscsi_conn *conn)
{
@@ -545,7 +545,7 @@ static void iscsit_task_reassign_prepare
}
}
-int iscsit_task_reassign_prepare_write(
+static int iscsit_task_reassign_prepare_write(
struct iscsi_tmr_req *tmr_req,
struct iscsi_conn *conn)
{
Index: lio-core/drivers/target/iscsi/iscsi_target_tq.c
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target_tq.c 2012-07-08 20:25:56.759950442 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target_tq.c 2012-09-26 10:39:43.752450227 +0200
@@ -40,7 +40,7 @@ static void iscsi_add_ts_to_active_list(
spin_unlock(&active_ts_lock);
}
-extern void iscsi_add_ts_to_inactive_list(struct iscsi_thread_set *ts)
+static void iscsi_add_ts_to_inactive_list(struct iscsi_thread_set *ts)
{
spin_lock(&inactive_ts_lock);
list_add_tail(&ts->ts_list, &inactive_ts_list);
@@ -76,7 +76,7 @@ static struct iscsi_thread_set *iscsi_ge
return ts;
}
-extern int iscsi_allocate_thread_sets(u32 thread_pair_count)
+int iscsi_allocate_thread_sets(u32 thread_pair_count)
{
int allocated_thread_pair_count = 0, i, thread_id;
struct iscsi_thread_set *ts = NULL;
@@ -140,7 +140,7 @@ extern int iscsi_allocate_thread_sets(u3
return allocated_thread_pair_count;
}
-extern void iscsi_deallocate_thread_sets(void)
+void iscsi_deallocate_thread_sets(void)
{
u32 released_count = 0;
struct iscsi_thread_set *ts = NULL;
Index: lio-core/drivers/target/iscsi/iscsi_target_tq.h
===================================================================
--- lio-core.orig/drivers/target/iscsi/iscsi_target_tq.h 2012-07-08 20:25:56.759950442 +0200
+++ lio-core/drivers/target/iscsi/iscsi_target_tq.h 2012-09-26 10:39:43.752450227 +0200
@@ -5,7 +5,6 @@
* Defines for thread sets.
*/
extern int iscsi_thread_set_force_reinstatement(struct iscsi_conn *);
-extern void iscsi_add_ts_to_inactive_list(struct iscsi_thread_set *);
extern int iscsi_allocate_thread_sets(u32);
extern void iscsi_deallocate_thread_sets(void);
extern void iscsi_activate_thread_set(struct iscsi_conn *, struct iscsi_thread_set *);
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
