LU-9887 tests: adjust lfsck speek test error range

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

diff --git a/lustre/obdclass/lu_ref.c b/lustre/obdclass/lu_ref.c
index 3308b17..bef2903 100644 (file)
--- a/lustre/obdclass/lu_ref.c
+++ b/lustre/obdclass/lu_ref.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) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -84,8 +80,8 @@ static struct lu_kmem_descr lu_ref_caches[] = {
  *
  * Protected by lu_ref_refs_guard.
  */
-static struct list_head lu_ref_refs;
-static spinlock_t lu_ref_refs_guard;
+static LIST_HEAD(lu_ref_refs);
+static DEFINE_SPINLOCK(lu_ref_refs_guard);
 static struct lu_ref lu_ref_marker = {
        .lf_guard       = __SPIN_LOCK_UNLOCKED(lu_ref_marker.lf_guard),
        .lf_list        = LIST_HEAD_INIT(lu_ref_marker.lf_list),
@@ -135,15 +131,19 @@ void lu_ref_init_loc(struct lu_ref *ref, const char *func, const int line)
        list_add(&ref->lf_linkage, &lu_ref_refs);
        spin_unlock(&lu_ref_refs_guard);
 }
+EXPORT_SYMBOL(lu_ref_init_loc);
 
 void lu_ref_fini(struct lu_ref *ref)
 {
+       spin_lock(&ref->lf_guard);
        REFASSERT(ref, list_empty(&ref->lf_list));
        REFASSERT(ref, ref->lf_refs == 0);
+       spin_unlock(&ref->lf_guard);
        spin_lock(&lu_ref_refs_guard);
        list_del_init(&ref->lf_linkage);
        spin_unlock(&lu_ref_refs_guard);
 }
+EXPORT_SYMBOL(lu_ref_fini);
 
 static struct lu_ref_link *lu_ref_add_context(struct lu_ref *ref,
                                               int flags,
@@ -179,8 +179,9 @@ static struct lu_ref_link *lu_ref_add_context(struct lu_ref *ref,
 void lu_ref_add(struct lu_ref *ref, const char *scope, const void *source)
 {
        might_sleep();
-       lu_ref_add_context(ref, GFP_IOFS, scope, source);
+       lu_ref_add_context(ref, GFP_NOFS, scope, source);
 }
+EXPORT_SYMBOL(lu_ref_add);
 
 void lu_ref_add_at(struct lu_ref *ref, struct lu_ref_link *link,
                   const char *scope, const void *source)
@@ -193,6 +194,7 @@ void lu_ref_add_at(struct lu_ref *ref, struct lu_ref_link *link,
        ref->lf_refs++;
        spin_unlock(&ref->lf_guard);
 }
+EXPORT_SYMBOL(lu_ref_add_at);
 
 /**
  * Version of lu_ref_add() to be used in non-blockable contexts.
@@ -202,6 +204,7 @@ void lu_ref_add_atomic(struct lu_ref *ref, const char *scope,
 {
        lu_ref_add_context(ref, GFP_ATOMIC, scope, source);
 }
+EXPORT_SYMBOL(lu_ref_add_atomic);
 
 static inline int lu_ref_link_eq(const struct lu_ref_link *link,
                                  const char *scope, const void *source)
@@ -255,31 +258,33 @@ void lu_ref_del(struct lu_ref *ref, const char *scope, const void *source)
                spin_unlock(&ref->lf_guard);
        }
 }
+EXPORT_SYMBOL(lu_ref_del);
 
 void lu_ref_set_at(struct lu_ref *ref, struct lu_ref_link *link,
                   const char *scope,
                   const void *source0, const void *source1)
 {
-       REFASSERT(ref, link != NULL && !IS_ERR(link));
-
        spin_lock(&ref->lf_guard);
+       REFASSERT(ref, link != NULL && !IS_ERR(link));
        REFASSERT(ref, link->ll_ref == ref);
        REFASSERT(ref, lu_ref_link_eq(link, scope, source0));
        link->ll_source = source1;
        spin_unlock(&ref->lf_guard);
 }
+EXPORT_SYMBOL(lu_ref_set_at);
 
 void lu_ref_del_at(struct lu_ref *ref, struct lu_ref_link *link,
                   const char *scope, const void *source)
 {
-       REFASSERT(ref, link != NULL && !IS_ERR(link));
        spin_lock(&ref->lf_guard);
+       REFASSERT(ref, link != NULL && !IS_ERR(link));
        REFASSERT(ref, link->ll_ref == ref);
        REFASSERT(ref, lu_ref_link_eq(link, scope, source));
        list_del(&link->ll_linkage);
        ref->lf_refs--;
        spin_unlock(&ref->lf_guard);
 }
+EXPORT_SYMBOL(lu_ref_del_at);
 
 #ifdef CONFIG_PROC_FS
 
@@ -414,8 +419,6 @@ int lu_ref_global_init(void)
        CDEBUG(D_CONSOLE,
               "lu_ref tracking is enabled. Performance isn't.\n");
 
-       INIT_LIST_HEAD(&lu_ref_refs);
-       spin_lock_init(&lu_ref_refs_guard);
         result = lu_kmem_init(lu_ref_caches);
 
 #ifdef CONFIG_PROC_FS