X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fcl_io.c;h=94c3fc5dec8d200c2c81a23cfbd2147feb919dca;hp=17d7db2d5c1167088727b34908f1901140bb11c6;hb=ad8f66967d66238539700081d555ebc08e43cead;hpb=c152f7b0c84cab95e55fb0ba19d0b6bdeefd6e12

diff --git a/lustre/obdclass/cl_io.c b/lustre/obdclass/cl_io.c
index 17d7db2..94c3fc5 100644
--- a/lustre/obdclass/cl_io.c
+++ b/lustre/obdclass/cl_io.c
@@ -67,14 +67,6 @@ static inline int cl_io_is_loopable(const struct cl_io *io)
 }
 
 /**
- * Returns true iff there is an IO ongoing in the given environment.
- */
-int cl_io_is_going(const struct lu_env *env)
-{
-        return cl_env_info(env)->clt_current_io != NULL;
-}
-
-/**
  * cl_io invariant that holds at all times when exported cl_io_*() functions
  * are entered and left.
  */
@@ -99,7 +91,6 @@ static int cl_io_invariant(const struct cl_io *io)
 void cl_io_fini(const struct lu_env *env, struct cl_io *io)
 {
 	struct cl_io_slice    *slice;
-	struct cl_thread_info *info;
 
         LINVRNT(cl_io_type_is_valid(io->ci_type));
         LINVRNT(cl_io_invariant(io));
@@ -119,9 +110,6 @@ void cl_io_fini(const struct lu_env *env, struct cl_io *io)
                 slice->cis_io = NULL;
         }
         io->ci_state = CIS_FINI;
-        info = cl_env_info(env);
-        if (info->clt_current_io == io)
-                info->clt_current_io = NULL;
 
 	/* sanity check for layout change */
 	switch(io->ci_type) {
@@ -185,11 +173,8 @@ static int cl_io_init0(const struct lu_env *env, struct cl_io *io,
 int cl_io_sub_init(const struct lu_env *env, struct cl_io *io,
                    enum cl_io_type iot, struct cl_object *obj)
 {
-        struct cl_thread_info *info = cl_env_info(env);
-
         LASSERT(obj != cl_object_top(obj));
-        if (info->clt_current_io == NULL)
-                info->clt_current_io = io;
+
         return cl_io_init0(env, io, iot, obj);
 }
 EXPORT_SYMBOL(cl_io_sub_init);
@@ -207,12 +192,8 @@ EXPORT_SYMBOL(cl_io_sub_init);
 int cl_io_init(const struct lu_env *env, struct cl_io *io,
                enum cl_io_type iot, struct cl_object *obj)
 {
-        struct cl_thread_info *info = cl_env_info(env);
-
         LASSERT(obj == cl_object_top(obj));
-        LASSERT(info->clt_current_io == NULL);
 
-        info->clt_current_io = io;
         return cl_io_init0(env, io, iot, obj);
 }
 EXPORT_SYMBOL(cl_io_init);