b=14230

i=yury.umanets
i=alex.zhuravlev

fix for multiple definition of mdc_init_ea_size().

diff --git a/lustre/cmm/cmm_device.c b/lustre/cmm/cmm_device.c
index 066eeca..3ca368a 100644 (file)
--- a/lustre/cmm/cmm_device.c
+++ b/lustre/cmm/cmm_device.c
@@ -138,7 +138,7 @@ static int cmm_post_init_mdc(const struct lu_env *env,
         spin_lock(&cmm->cmm_tgt_guard);
         list_for_each_entry_safe(mc, tmp, &cmm->cmm_targets,
                                  mc_linkage) {
         spin_lock(&cmm->cmm_tgt_guard);
         list_for_each_entry_safe(mc, tmp, &cmm->cmm_targets,
                                  mc_linkage) {

-                mdc_init_ea_size(env, mc, max_mdsize, max_cookiesize);
+                cmm_mdc_init_ea_size(env, mc, max_mdsize, max_cookiesize);

         }
         spin_unlock(&cmm->cmm_tgt_guard);
         RETURN(rc);
         }
         spin_unlock(&cmm->cmm_tgt_guard);
         RETURN(rc);

diff --git a/lustre/cmm/mdc_device.c b/lustre/cmm/mdc_device.c
index 2b04e87..3328740 100644 (file)
--- a/lustre/cmm/mdc_device.c
+++ b/lustre/cmm/mdc_device.c
@@ -235,7 +235,7 @@ static struct lu_device_operations mdc_lu_ops = {
         .ldo_process_config = mdc_process_config
 };
 
         .ldo_process_config = mdc_process_config
 };
 

-void mdc_init_ea_size(const struct lu_env *env, struct mdc_device *mc, 
+void cmm_mdc_init_ea_size(const struct lu_env *env, struct mdc_device *mc,

                       int max_mdsize, int max_cookiesize)
 {
         struct obd_device *obd = class_exp2obd(mc->mc_desc.cl_exp);
                       int max_mdsize, int max_cookiesize)
 {
         struct obd_device *obd = class_exp2obd(mc->mc_desc.cl_exp);

diff --git a/lustre/cmm/mdc_internal.h b/lustre/cmm/mdc_internal.h
index b5a2ae6..cc418a8 100644 (file)
--- a/lustre/cmm/mdc_internal.h
+++ b/lustre/cmm/mdc_internal.h
@@ -98,7 +98,7 @@ struct lu_object *mdc_object_alloc(const struct lu_env *,
                                    const struct lu_object_header *,
                                    struct lu_device *);
 
                                    const struct lu_object_header *,
                                    struct lu_device *);
 

-void mdc_init_ea_size(const struct lu_env *env, struct mdc_device *mc, 
+void cmm_mdc_init_ea_size(const struct lu_env *env, struct mdc_device *mc,

                       int max_mdsize, int max_cookiesize);
 #ifdef HAVE_SPLIT_SUPPORT
 int mdc_send_page(struct cmm_device *cmm, const struct lu_env *env,
                       int max_mdsize, int max_cookiesize);
 #ifdef HAVE_SPLIT_SUPPORT
 int mdc_send_page(struct cmm_device *cmm, const struct lu_env *env,

diff --git a/lustre/mdc/mdc_internal.h b/lustre/mdc/mdc_internal.h
index 2bf1326..bcf08ba 100644 (file)
--- a/lustre/mdc/mdc_internal.h
+++ b/lustre/mdc/mdc_internal.h
@@ -110,9 +110,6 @@ int mdc_resource_get_unused(struct obd_export *exp, struct lu_fid *fid,
 int mdc_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
                   struct md_op_data *op_data);
 
 int mdc_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
                   struct md_op_data *op_data);
 

-int mdc_init_ea_size(struct obd_export *exp, int easize, int def_easzie,
-                     int cookiesize);
-

 int mdc_open(struct obd_export *exp, obd_id ino, int type, int flags,
              struct lov_mds_md *lmm, int lmm_size, struct lustre_handle *fh,
              struct ptlrpc_request **);
 int mdc_open(struct obd_export *exp, obd_id ino, int type, int flags,
              struct lov_mds_md *lmm, int lmm_size, struct lustre_handle *fh,
              struct ptlrpc_request **);

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 6dec67f..b58bdcf 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -1545,7 +1545,7 @@ err_rpc_lock:
  * us to make MDS RPCs with large enough reply buffers to hold the
  * maximum-sized (= maximum striped) EA and cookie without having to
  * calculate this (via a call into the LOV + OSCs) each time we make an RPC. */
  * us to make MDS RPCs with large enough reply buffers to hold the
  * maximum-sized (= maximum striped) EA and cookie without having to
  * calculate this (via a call into the LOV + OSCs) each time we make an RPC. */

-int mdc_init_ea_size(struct obd_export *exp, int easize,
+static int mdc_init_ea_size(struct obd_export *exp, int easize,

                      int def_easize, int cookiesize)
 {
         struct obd_device *obd = exp->exp_obd;
                      int def_easize, int cookiesize)
 {
         struct obd_device *obd = exp->exp_obd;