X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftarget%2Ftgt_lastrcvd.c;h=50147d313acc414babbd957b5c4364b009a32383;hb=8febfe0e30c5febdf716e4591c355199de4a6ab8;hp=fa9ff1c8cc5125a47ffbd9d429de40eb597b54f1;hpb=21d716e6c16424d9deb646456758ebbaa9c70fec;p=fs%2Flustre-release.git

diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c
index fa9ff1c..50147d3 100644
--- a/lustre/target/tgt_lastrcvd.c
+++ b/lustre/target/tgt_lastrcvd.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -127,7 +127,6 @@ int tgt_client_data_read(const struct lu_env *env, struct lu_target *tgt,
 	       lcd->lcd_last_close_result, rc);
 	return rc;
 }
-EXPORT_SYMBOL(tgt_client_data_read);
 
 int tgt_client_data_write(const struct lu_env *env, struct lu_target *tgt,
 			  struct lsd_client_data *lcd, loff_t *off,
@@ -143,12 +142,12 @@ int tgt_client_data_write(const struct lu_env *env, struct lu_target *tgt,
 
 	return dt_record_write(env, tgt->lut_last_rcvd, &tti->tti_buf, off, th);
 }
-EXPORT_SYMBOL(tgt_client_data_write);
 
 /**
  * Update client data in last_rcvd
  */
-int tgt_client_data_update(const struct lu_env *env, struct obd_export *exp)
+static int tgt_client_data_update(const struct lu_env *env,
+				  struct obd_export *exp)
 {
 	struct tg_export_data	*ted = &exp->exp_target_data;
 	struct lu_target	*tgt = class_exp2tgt(exp);
@@ -217,7 +216,6 @@ int tgt_server_data_read(const struct lu_env *env, struct lu_target *tgt)
 	       tgt->lut_lsd.lsd_uuid, tgt->lut_lsd.lsd_last_transno, rc);
         return rc;
 }
-EXPORT_SYMBOL(tgt_server_data_read);
 
 int tgt_server_data_write(const struct lu_env *env, struct lu_target *tgt,
 			  struct thandle *th)
@@ -240,7 +238,6 @@ int tgt_server_data_write(const struct lu_env *env, struct lu_target *tgt,
 
 	RETURN(rc);
 }
-EXPORT_SYMBOL(tgt_server_data_write);
 
 /**
  * Update server data in last_rcvd
@@ -326,9 +323,9 @@ cleanup:
 
 	RETURN(rc);
 }
-EXPORT_SYMBOL(tgt_truncate_last_rcvd);
 
-void tgt_client_epoch_update(const struct lu_env *env, struct obd_export *exp)
+static void tgt_client_epoch_update(const struct lu_env *env,
+				    struct obd_export *exp)
 {
 	struct lsd_client_data	*lcd = exp->exp_target_data.ted_lcd;
 	struct lu_target	*tgt = class_exp2tgt(exp);
@@ -368,7 +365,7 @@ void tgt_boot_epoch_update(struct lu_target *tgt)
 	tgt->lut_lsd.lsd_start_epoch = start_epoch;
 	spin_unlock(&tgt->lut_translock);
 
-	CFS_INIT_LIST_HEAD(&client_list);
+	INIT_LIST_HEAD(&client_list);
 	/**
 	 * The recovery is not yet finished and final queue can still be updated
 	 * with resend requests. Move final list to separate one for processing
@@ -394,7 +391,6 @@ void tgt_boot_epoch_update(struct lu_target *tgt)
 	tgt_server_data_update(&env, tgt, 1);
 	lu_env_fini(&env);
 }
-EXPORT_SYMBOL(tgt_boot_epoch_update);
 
 /**
  * commit callback, need to update last_commited value
@@ -406,8 +402,8 @@ struct tgt_last_committed_callback {
 	__u64			 llcc_transno;
 };
 
-void tgt_cb_last_committed(struct lu_env *env, struct thandle *th,
-			   struct dt_txn_commit_cb *cb, int err)
+static void tgt_cb_last_committed(struct lu_env *env, struct thandle *th,
+				  struct dt_txn_commit_cb *cb, int err)
 {
 	struct tgt_last_committed_callback *ccb;
 
@@ -452,7 +448,7 @@ int tgt_last_commit_cb_add(struct thandle *th, struct lu_target *tgt,
 
 	dcb = &ccb->llcc_cb;
 	dcb->dcb_func = tgt_cb_last_committed;
-	CFS_INIT_LIST_HEAD(&dcb->dcb_linkage);
+	INIT_LIST_HEAD(&dcb->dcb_linkage);
 	strlcpy(dcb->dcb_name, "tgt_cb_last_committed", sizeof(dcb->dcb_name));
 
 	rc = dt_trans_cb_add(th, dcb);
@@ -467,15 +463,14 @@ int tgt_last_commit_cb_add(struct thandle *th, struct lu_target *tgt,
 
 	return rc;
 }
-EXPORT_SYMBOL(tgt_last_commit_cb_add);
 
 struct tgt_new_client_callback {
 	struct dt_txn_commit_cb	 lncc_cb;
 	struct obd_export	*lncc_exp;
 };
 
-void tgt_cb_new_client(struct lu_env *env, struct thandle *th,
-		       struct dt_txn_commit_cb *cb, int err)
+static void tgt_cb_new_client(struct lu_env *env, struct thandle *th,
+			      struct dt_txn_commit_cb *cb, int err)
 {
 	struct tgt_new_client_callback *ccb;
 
@@ -514,7 +509,7 @@ int tgt_new_client_cb_add(struct thandle *th, struct obd_export *exp)
 
 	dcb = &ccb->lncc_cb;
 	dcb->dcb_func = tgt_cb_new_client;
-	CFS_INIT_LIST_HEAD(&dcb->dcb_linkage);
+	INIT_LIST_HEAD(&dcb->dcb_linkage);
 	strlcpy(dcb->dcb_name, "tgt_cb_new_client", sizeof(dcb->dcb_name));
 
 	rc = dt_trans_cb_add(th, dcb);
@@ -631,7 +626,6 @@ int tgt_client_add(const struct lu_env *env,  struct obd_export *exp, int idx)
 
 	RETURN(0);
 }
-EXPORT_SYMBOL(tgt_client_add);
 
 int tgt_client_del(const struct lu_env *env, struct obd_export *exp)
 {
@@ -692,9 +686,9 @@ EXPORT_SYMBOL(tgt_client_del);
 /*
  * last_rcvd & last_committed update callbacks
  */
-int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
-			 struct dt_object *obj, __u64 opdata,
-			 struct thandle *th, struct ptlrpc_request *req)
+static int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
+				struct dt_object *obj, __u64 opdata,
+				struct thandle *th, struct ptlrpc_request *req)
 {
 	struct tgt_thread_info	*tti = tgt_th_info(env);
 	struct tg_export_data	*ted;
@@ -836,9 +830,11 @@ srv_update:
  * It updates last_rcvd client slot and version of object in
  * simple way but with all locks to simulate all drawbacks
  */
-int tgt_last_rcvd_update_echo(const struct lu_env *env, struct lu_target *tgt,
-			      struct dt_object *obj, struct thandle *th,
-			      struct obd_export *exp)
+static int tgt_last_rcvd_update_echo(const struct lu_env *env,
+				     struct lu_target *tgt,
+				     struct dt_object *obj,
+				     struct thandle *th,
+				     struct obd_export *exp)
 {
 	struct tgt_thread_info	*tti = tgt_th_info(env);
 	struct tg_export_data	*ted = &exp->exp_target_data;
@@ -874,8 +870,9 @@ int tgt_last_rcvd_update_echo(const struct lu_env *env, struct lu_target *tgt,
 	RETURN(rc);
 }
 
-int tgt_clients_data_init(const struct lu_env *env, struct lu_target *tgt,
-			  unsigned long last_size)
+static int tgt_clients_data_init(const struct lu_env *env,
+				 struct lu_target *tgt,
+				 unsigned long last_size)
 {
 	struct obd_device	*obd = tgt->lut_obd;
 	struct lr_server_data	*lsd = &tgt->lut_lsd;