LU-8836 lprocfs: move lprocfs_stats_[un]lock to a source file

[fs/lustre-release.git] / lustre / lov / lov_lock.c

diff --git a/lustre/lov/lov_lock.c b/lustre/lov/lov_lock.c
index 60af105..4421e7b 100644 (file)
--- a/lustre/lov/lov_lock.c
+++ b/lustre/lov/lov_lock.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -72,27 +68,19 @@ static struct lov_sublock_env *lov_sublock_env_get(const struct lu_env *env,
          * they are not initialized at all. As a temp fix, in this case,
          * we still borrow the parent's env to call sublock operations.
          */
-        if (!io || !cl_object_same(io->ci_obj, parent->cll_descr.cld_obj)) {
-                subenv->lse_env = env;
-                subenv->lse_io  = io;
-                subenv->lse_sub = NULL;
-        } else {
-                sub = lov_sub_get(env, lio, lls->sub_stripe);
-                if (!IS_ERR(sub)) {
-                        subenv->lse_env = sub->sub_env;
-                        subenv->lse_io  = sub->sub_io;
-                        subenv->lse_sub = sub;
-                } else {
-                        subenv = (void*)sub;
-                }
-        }
-        return subenv;
-}
-
-static void lov_sublock_env_put(struct lov_sublock_env *subenv)
-{
-        if (subenv && subenv->lse_sub)
-                lov_sub_put(subenv->lse_sub);
+       if (!io || !cl_object_same(io->ci_obj, parent->cll_descr.cld_obj)) {
+               subenv->lse_env = env;
+               subenv->lse_io = io;
+       } else {
+               sub = lov_sub_get(env, lio, lls->sub_stripe);
+               if (!IS_ERR(sub)) {
+                       subenv->lse_env = sub->sub_env;
+                       subenv->lse_io  = sub->sub_io;
+               } else {
+                       subenv = (void*)sub;
+               }
+       }
+       return subenv;
 }
 
 static int lov_sublock_init(const struct lu_env *env,
@@ -107,7 +95,6 @@ static int lov_sublock_init(const struct lu_env *env,
        if (!IS_ERR(subenv)) {
                result = cl_lock_init(subenv->lse_env, &lls->sub_lock,
                                      subenv->lse_io);
-               lov_sublock_env_put(subenv);
        } else {
                /* error occurs. */
                result = PTR_ERR(subenv);
@@ -260,7 +247,6 @@ static int lov_lock_enqueue(const struct lu_env *env,
 
                rc = cl_lock_enqueue(subenv->lse_env, subenv->lse_io,
                                     &lls->sub_lock, anchor);
-               lov_sublock_env_put(subenv);
                if (rc != 0)
                        break;
 
@@ -290,7 +276,6 @@ static void lov_lock_cancel(const struct lu_env *env,
                subenv = lov_sublock_env_get(env, lock, lls);
                if (!IS_ERR(subenv)) {
                        cl_lock_cancel(subenv->lse_env, sublock);
-                       lov_sublock_env_put(subenv);
                } else {
                        CL_LOCK_DEBUG(D_ERROR, env, slice->cls_lock,
                                      "lov_lock_cancel fails with %ld.\n",