LU-6017 obd: remove destroy cookie handling

[fs/lustre-release.git] / lustre / lmv / lmv_obd.c

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 29550e6..5fe258e 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -265,9 +265,8 @@ static int lmv_connect(const struct lu_env *env,
        RETURN(rc);
 }
 
-static int lmv_init_ea_size(struct obd_export *exp,
-                           __u32 easize, __u32 def_easize,
-                           __u32 cookiesize, __u32 def_cookiesize)
+static int lmv_init_ea_size(struct obd_export *exp, __u32 easize,
+                           __u32 def_easize)
 {
        struct obd_device       *obd = exp->exp_obd;
        struct lmv_obd          *lmv = &obd->u.lmv;
@@ -284,14 +283,7 @@ static int lmv_init_ea_size(struct obd_export *exp,
                 lmv->max_def_easize = def_easize;
                 change = 1;
         }
-        if (lmv->max_cookiesize < cookiesize) {
-                lmv->max_cookiesize = cookiesize;
-                change = 1;
-        }
-       if (lmv->max_def_cookiesize < def_cookiesize) {
-               lmv->max_def_cookiesize = def_cookiesize;
-               change = 1;
-       }
+
        if (change == 0)
                RETURN(0);
 
@@ -306,8 +298,7 @@ static int lmv_init_ea_size(struct obd_export *exp,
                        continue;
                }
 
-               rc = md_init_ea_size(tgt->ltd_exp, easize, def_easize,
-                                    cookiesize, def_cookiesize);
+               rc = md_init_ea_size(tgt->ltd_exp, easize, def_easize);
                if (rc) {
                        CERROR("%s: obd_init_ea_size() failed on MDT target %d:"
                               " rc = %d\n", obd->obd_name, i, rc);
@@ -392,8 +383,7 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
        tgt->ltd_exp = mdc_exp;
        lmv->desc.ld_active_tgt_count++;
 
-       md_init_ea_size(tgt->ltd_exp, lmv->max_easize, lmv->max_def_easize,
-                       lmv->max_cookiesize, lmv->max_def_cookiesize);
+       md_init_ea_size(tgt->ltd_exp, lmv->max_easize, lmv->max_def_easize);
 
        CDEBUG(D_CONFIG, "Connected to %s(%s) successfully (%d)\n",
                mdc_obd->obd_name, mdc_obd->obd_uuid.uuid,
@@ -522,7 +512,7 @@ static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp,
                } else {
                        int easize = sizeof(struct lmv_stripe_md) +
                                lmv->desc.ld_tgt_count * sizeof(struct lu_fid);
-                       lmv_init_ea_size(obd->obd_self_export, easize, 0, 0, 0);
+                       lmv_init_ea_size(obd->obd_self_export, easize, 0);
                }
        }
 
@@ -578,7 +568,7 @@ int lmv_check_connect(struct obd_device *obd)
        class_export_put(lmv->exp);
        lmv->connected = 1;
        easize = lmv_mds_md_size(lmv->desc.ld_tgt_count, LMV_MAGIC);
-       lmv_init_ea_size(obd->obd_self_export, easize, 0, 0, 0);
+       lmv_init_ea_size(obd->obd_self_export, easize, 0);
        mutex_unlock(&lmv->lmv_init_mutex);
        RETURN(0);
 
@@ -1373,7 +1363,6 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
        obd_str2uuid(&lmv->desc.ld_uuid, desc->ld_uuid.uuid);
        lmv->desc.ld_tgt_count = 0;
        lmv->desc.ld_active_tgt_count = 0;
-       lmv->max_cookiesize = 0;
        lmv->max_def_easize = 0;
        lmv->max_easize = 0;
        lmv->lmv_placement = PLACEMENT_CHAR_POLICY;
@@ -2799,8 +2788,6 @@ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp,
                RETURN(-EINVAL);
        } else if (KEY_IS(KEY_MAX_EASIZE) ||
                   KEY_IS(KEY_DEFAULT_EASIZE) ||
-                  KEY_IS(KEY_MAX_COOKIESIZE) ||
-                  KEY_IS(KEY_DEFAULT_COOKIESIZE) ||
                   KEY_IS(KEY_CONN_DATA)) {
                rc = lmv_check_connect(obd);
                if (rc)