LU-1217 osc: to not check a cl_lock's state w/o protection

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

diff --git a/lustre/obdclass/lu_ref.c b/lustre/obdclass/lu_ref.c
index 01d31b6..3b9011e 100644 (file)
--- a/lustre/obdclass/lu_ref.c
+++ b/lustre/obdclass/lu_ref.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -70,8 +68,8 @@
                   lu_ref_print(__ref);                  \
                   cfs_spin_unlock(&__ref->lf_guard);    \
                   lu_ref_print_all();                   \
-                  cfs_spin_lock(&__ref->lf_guard);      \
                   LASSERT(0);                           \
+                  cfs_spin_lock(&__ref->lf_guard);      \
           }                                             \
   } while (0)
 
@@ -239,7 +237,7 @@ static struct lu_ref_link *lu_ref_find(struct lu_ref *ref, const char *scope,
                 ++iterations;
                 if (lu_ref_link_eq(link, scope, source)) {
                         if (iterations > lu_ref_chain_max_length) {
-                                CWARN("Long lu_ref chain %i \"%s\":%p\n",
+                                CWARN("Long lu_ref chain %d \"%s\":%p\n",
                                       iterations, scope, source);
                                 lu_ref_chain_max_length = iterations * 3 / 2;
                         }