- rename fld_*_export() functions into fld_*_target().

diff --git a/lustre/cmm/cmm_device.c b/lustre/cmm/cmm_device.c
index d4db5a4..d410861 100644 (file)
--- a/lustre/cmm/cmm_device.c
+++ b/lustre/cmm/cmm_device.c
@@ -142,7 +142,7 @@ static int cmm_add_mdc(const struct lu_context *ctx,
 
                 lu_device_get(cmm2lu_dev(cm));
 
-                fld_client_add_export(&cm->cmm_fld,
+                fld_client_add_target(&cm->cmm_fld,
                                       mc->mc_desc.cl_exp);
         }
         RETURN(rc);

diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index 20520f7..3f68be7 100644 (file)
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -175,7 +175,7 @@ struct lu_fld_hash fld_hash[3] = {
 };
 
 static struct obd_export *
-fld_client_get_export(struct lu_client_fld *fld, __u64 seq)
+fld_client_get_target(struct lu_client_fld *fld, __u64 seq)
 {
         struct obd_export *fld_exp;
         int count = 0, hash;
@@ -203,7 +203,7 @@ fld_client_get_export(struct lu_client_fld *fld, __u64 seq)
 /* add export to FLD. This is usually done by CMM and LMV as they are main users
  * of FLD module. */
 int
-fld_client_add_export(struct lu_client_fld *fld,
+fld_client_add_target(struct lu_client_fld *fld,
                       struct obd_export *exp)
 {
         struct client_obd *cli = &exp->exp_obd->u.cli;
@@ -234,11 +234,11 @@ fld_client_add_export(struct lu_client_fld *fld,
         
         RETURN(0);
 }
-EXPORT_SYMBOL(fld_client_add_export);
+EXPORT_SYMBOL(fld_client_add_target);
 
 /* remove export from FLD */
 int
-fld_client_del_export(struct lu_client_fld *fld,
+fld_client_del_target(struct lu_client_fld *fld,
                           struct obd_export *exp)
 {
         struct obd_export *fld_exp;
@@ -261,7 +261,7 @@ fld_client_del_export(struct lu_client_fld *fld,
         spin_unlock(&fld->fld_lock);
         RETURN(-ENOENT);
 }
-EXPORT_SYMBOL(fld_client_del_export);
+EXPORT_SYMBOL(fld_client_del_target);
 
 #ifdef LPROCFS
 static int
@@ -419,7 +419,7 @@ fld_client_create(struct lu_client_fld *fld,
         __u32 rc;
         ENTRY;
 
-        fld_exp = fld_client_get_export(fld, seq);
+        fld_exp = fld_client_get_target(fld, seq);
         if (!fld_exp)
                 RETURN(-EINVAL);
         md_fld.mf_seq = seq;
@@ -448,7 +448,7 @@ fld_client_delete(struct lu_client_fld *fld,
         fld_cache_delete(fld_cache, seq);
 #endif
         
-        fld_exp = fld_client_get_export(fld, seq);
+        fld_exp = fld_client_get_target(fld, seq);
         if (!fld_exp)
                 RETURN(-EINVAL);
 
@@ -469,7 +469,7 @@ fld_client_get(struct lu_client_fld *fld,
         int rc;
         ENTRY;
 
-        fld_exp = fld_client_get_export(fld, seq);
+        fld_exp = fld_client_get_target(fld, seq);
         if (!fld_exp)
                 RETURN(-EINVAL);
                 

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index bff3911..f57fa28 100644 (file)
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -110,10 +110,10 @@ int fld_client_create(struct lu_client_fld *fld,
 int fld_client_delete(struct lu_client_fld *fld,
                       __u64 seq);
 
-int fld_client_add_export(struct lu_client_fld *fld,
+int fld_client_add_target(struct lu_client_fld *fld,
                           struct obd_export *exp);
 
-int fld_client_del_export(struct lu_client_fld *fld,
+int fld_client_del_target(struct lu_client_fld *fld,
                           struct obd_export *exp);
 
 #endif

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 41d9185..4d797b3 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -337,7 +337,7 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
         }
 
         mdc_exp = class_conn2export(&conn);
-        fld_client_add_export(&lmv->lmv_fld, mdc_exp);
+        fld_client_add_target(&lmv->lmv_fld, mdc_exp);
 
         mdc_data = &class_exp2cliimp(mdc_exp)->imp_connect_data;