X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flovsub_lock.c;h=de8b5c72260d7b6b3c499cf6ee618d8c99bde84c;hb=9b74a75ecbdccb084eb6a747dfda78c6fb7ef176;hp=de8d6dadda8d195f91ca5978f68f4541bf789654;hpb=3f3a24dc5d7d421e1514dc49cc7c2eb5cb762b26;p=fs%2Flustre-release.git

diff --git a/lustre/lov/lovsub_lock.c b/lustre/lov/lovsub_lock.c
index de8d6da..de8b5c7 100644
--- a/lustre/lov/lovsub_lock.c
+++ b/lustre/lov/lovsub_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
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -57,11 +53,10 @@ static void lovsub_lock_fini(const struct lu_env *env,
 {
         struct lovsub_lock   *lsl;
 
-        ENTRY;
-        lsl = cl2lovsub_lock(slice);
-	LASSERT(list_empty(&lsl->lss_parents));
-        OBD_SLAB_FREE_PTR(lsl, lovsub_lock_kmem);
-        EXIT;
+	ENTRY;
+	lsl = cl2lovsub_lock(slice);
+	OBD_SLAB_FREE_PTR(lsl, lovsub_lock_kmem);
+	EXIT;
 }
 
 static const struct cl_lock_operations lovsub_lock_ops = {
@@ -77,7 +72,6 @@ int lovsub_lock_init(const struct lu_env *env, struct cl_object *obj,
 	ENTRY;
 	OBD_SLAB_ALLOC_PTR_GFP(lsk, lovsub_lock_kmem, GFP_NOFS);
 	if (lsk != NULL) {
-		INIT_LIST_HEAD(&lsk->lss_parents);
 		cl_lock_slice_add(lock, &lsk->lss_cl, obj, &lovsub_lock_ops);
 		result = 0;
 	} else