LU-7931 tests: setup/cleanup after every test script

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

diff --git a/lustre/llite/lcommon_misc.c b/lustre/llite/lcommon_misc.c
index 80ce42e..27d9610 100644 (file)
--- a/lustre/llite/lcommon_misc.c
+++ b/lustre/llite/lcommon_misc.c
@@ -37,6 +37,7 @@
  * future).
  *
  */
+#define DEBUG_SUBSYSTEM S_LLITE
 #include <obd_class.h>
 #include <obd_support.h>
 #include <obd.h>
@@ -138,7 +139,6 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
 
        io = vvp_env_thread_io(env);
         io->ci_obj = obj;
-       io->ci_ignore_layout = 1;
 
        rc = cl_io_init(env, io, CIT_MISC, io->ci_obj);
        if (rc != 0) {
@@ -168,13 +168,11 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
                return rc;
        }
 
-       lg->lg_env = cl_env_get(&refcheck);
+       lg->lg_env = env;
        lg->lg_io = io;
        lg->lg_lock = lock;
        lg->lg_gid = gid;
-       LASSERT(lg->lg_env == env);
 
-       cl_env_unplant(env, &refcheck);
        return 0;
 }
 
@@ -183,14 +181,10 @@ void cl_put_grouplock(struct ll_grouplock *lg)
        struct lu_env  *env  = lg->lg_env;
        struct cl_io   *io   = lg->lg_io;
        struct cl_lock *lock = lg->lg_lock;
-       __u16             refcheck;
 
        LASSERT(lg->lg_env != NULL);
        LASSERT(lg->lg_gid != 0);
 
-       cl_env_implant(env, &refcheck);
-       cl_env_put(env, &refcheck);
-
        cl_lock_release(env, lock);
        cl_io_fini(env, io);
        cl_env_put(env, NULL);