Branch HEAD

[fs/lustre-release.git] / lustre / obdclass / cl_object.c

diff --git a/lustre/obdclass/cl_object.c b/lustre/obdclass/cl_object.c
index e873554..8e013d5 100644 (file)
--- a/lustre/obdclass/cl_object.c
+++ b/lustre/obdclass/cl_object.c
@@ -879,7 +879,12 @@ struct lu_env *cl_env_nested_get(struct cl_env_nest *nest)
                 }
         }
         env = cl_env_get(&nest->cen_refcheck);
-        LASSERT(ergo(!IS_ERR(env), !cl_io_is_going(env)));
+        if (IS_ERR(env)) {
+                cl_env_reexit(nest->cen_cookie);
+                return env;
+        }
+
+        LASSERT(!cl_io_is_going(env));
         return env;
 }
 EXPORT_SYMBOL(cl_env_nested_get);