LU-6017 obd: remove destroy cookie handling

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

diff --git a/lustre/llite/lcommon_misc.c b/lustre/llite/lcommon_misc.c
index cd3c0d7..a0b0260 100644 (file)
--- a/lustre/llite/lcommon_misc.c
+++ b/lustre/llite/lcommon_misc.c
@@ -44,22 +44,21 @@
 
 #include "llite_internal.h"
 
-
 /* Initialize the default and maximum LOV EA and cookie sizes.  This allows
  * 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 cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)
+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, cookiesize;
+       int rc, easize, def_easize;
        struct lov_desc desc;
        __u16 stripes, def_stripes;
        ENTRY;
 
-        rc = obd_get_info(NULL, dt_exp, sizeof(KEY_LOVDESC), KEY_LOVDESC,
-                          &valsize, &desc, NULL);
+       rc = obd_get_info(NULL, dt_exp, sizeof(KEY_LOVDESC), KEY_LOVDESC,
+                         &valsize, &desc);
         if (rc)
                 RETURN(rc);
 
@@ -72,15 +71,9 @@ int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)
        lsm.lsm_stripe_count = def_stripes;
        def_easize = obd_size_diskmd(dt_exp, &lsm);
 
-       cookiesize = stripes * sizeof(struct llog_cookie);
-
-       /* 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 def/max_cookiesize: 0/%d\n",
-              def_easize, easize, cookiesize);
+       CDEBUG(D_HA, "updating def/max_easize: %d/%d\n", def_easize, easize);
 
-       rc = md_init_ea_size(md_exp, easize, def_easize, cookiesize, 0);
+       rc = md_init_ea_size(md_exp, easize, def_easize);
        RETURN(rc);
 }
 
@@ -126,7 +119,7 @@ int cl_ocd_update(struct obd_device *host,
 #define GROUPLOCK_SCOPE "grouplock"
 
 int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
-                     struct ccc_grouplock *cg)
+                    struct ll_grouplock *lg)
 {
         struct lu_env          *env;
         struct cl_io           *io;
@@ -140,7 +133,7 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
         if (IS_ERR(env))
                 return PTR_ERR(env);
 
-        io = ccc_env_thread_io(env);
+       io = vvp_env_thread_io(env);
         io->ci_obj = obj;
        io->ci_ignore_layout = 1;
 
@@ -154,7 +147,7 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
                return rc;
        }
 
-       lock = ccc_env_lock(env);
+       lock = vvp_env_lock(env);
        descr = &lock->cll_descr;
         descr->cld_obj = obj;
         descr->cld_start = 0;
@@ -172,25 +165,25 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
                return rc;
        }
 
-        cg->cg_env  = cl_env_get(&refcheck);
-        cg->cg_io   = io;
-        cg->cg_lock = lock;
-        cg->cg_gid  = gid;
-        LASSERT(cg->cg_env == env);
+       lg->lg_env = cl_env_get(&refcheck);
+       lg->lg_io = io;
+       lg->lg_lock = lock;
+       lg->lg_gid = gid;
+       LASSERT(lg->lg_env == env);
 
-        cl_env_unplant(env, &refcheck);
-        return 0;
+       cl_env_unplant(env, &refcheck);
+       return 0;
 }
 
-void cl_put_grouplock(struct ccc_grouplock *cg)
+void cl_put_grouplock(struct ll_grouplock *lg)
 {
-       struct lu_env  *env  = cg->cg_env;
-       struct cl_io   *io   = cg->cg_io;
-       struct cl_lock *lock = cg->cg_lock;
+       struct lu_env  *env  = lg->lg_env;
+       struct cl_io   *io   = lg->lg_io;
+       struct cl_lock *lock = lg->lg_lock;
        int             refcheck;
 
-       LASSERT(cg->cg_env);
-       LASSERT(cg->cg_gid);
+       LASSERT(lg->lg_env != NULL);
+       LASSERT(lg->lg_gid != 0);
 
        cl_env_implant(env, &refcheck);
        cl_env_put(env, &refcheck);
@@ -199,4 +192,3 @@ void cl_put_grouplock(struct ccc_grouplock *cg)
        cl_io_fini(env, io);
        cl_env_put(env, NULL);
 }
-