X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Flcommon_misc.c;h=27d961095090d701a1d93c07ac36ca4175d9f5e1;hp=80ce42e9409365d1c763a1497aadc10df56ee68b;hb=743f742874bfdf845a2f64c3d65081ea23740138;hpb=6f1c18d8389d33b143a55e61aa33895fe2abc515

diff --git a/lustre/llite/lcommon_misc.c b/lustre/llite/lcommon_misc.c
index 80ce42e..27d9610 100644
--- 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);