LU-5814 lov: use obd_get_info() to get def/max LOV EA sizes

[fs/lustre-release.git] / lustre / llite / lcommon_misc.c

diff --git a/lustre/llite/lcommon_misc.c b/lustre/llite/lcommon_misc.c
index a0b0260..6bd4d3e 100644 (file)
--- a/lustre/llite/lcommon_misc.c
+++ b/lustre/llite/lcommon_misc.c
@@ -50,30 +50,30 @@
  * calculate this (via a call into the LOV + OSCs) each time we make an RPC. */
 static int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)
 {
-       struct lov_stripe_md lsm = { .lsm_magic = LOV_MAGIC_V3 };
-       __u32 valsize = sizeof(struct lov_desc);
-       int rc, easize, def_easize;
-       struct lov_desc desc;
-       __u16 stripes, def_stripes;
+       u32 val_size;
+       u32 max_easize;
+       u32 def_easize;
+       int rc;
        ENTRY;
 
-       rc = obd_get_info(NULL, dt_exp, sizeof(KEY_LOVDESC), KEY_LOVDESC,
-                         &valsize, &desc);
-        if (rc)
-                RETURN(rc);
+       val_size = sizeof(max_easize);
+       rc = obd_get_info(NULL, dt_exp, sizeof(KEY_MAX_EASIZE), KEY_MAX_EASIZE,
+                         &val_size, &max_easize);
+       if (rc != 0)
+               RETURN(rc);
 
-        stripes = min(desc.ld_tgt_count, (__u32)LOV_MAX_STRIPE_COUNT);
-        lsm.lsm_stripe_count = stripes;
-        easize = obd_size_diskmd(dt_exp, &lsm);
+       val_size = sizeof(def_easize);
+       rc = obd_get_info(NULL, dt_exp, sizeof(KEY_DEFAULT_EASIZE),
+                         KEY_DEFAULT_EASIZE, &val_size, &def_easize);
+       if (rc != 0)
+               RETURN(rc);
 
-       def_stripes = min_t(__u32, desc.ld_default_stripe_count,
-                           LOV_MAX_STRIPE_COUNT);
-       lsm.lsm_stripe_count = def_stripes;
-       def_easize = obd_size_diskmd(dt_exp, &lsm);
+       /* default cookiesize is 0 because from 2.4 server doesn't send
+        * llog cookies to client. */
+       CDEBUG(D_HA, "updating def/max_easize: %d/%d\n",
+              def_easize, max_easize);
 
-       CDEBUG(D_HA, "updating def/max_easize: %d/%d\n", def_easize, easize);
-
-       rc = md_init_ea_size(md_exp, easize, def_easize);
+       rc = md_init_ea_size(md_exp, max_easize, def_easize);
        RETURN(rc);
 }