b=24188 rehash patch makes oops in quota_search_lqs

[fs/lustre-release.git] / lustre / include / lu_ref.h

diff --git a/lustre/include/lu_ref.h b/lustre/include/lu_ref.h
index fca9945..571278a 100644 (file)
--- a/lustre/include/lu_ref.h
+++ b/lustre/include/lu_ref.h
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * 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.
  *
  *   Author: Nikita Danilov <nikita.danilov@sun.com>
@@ -123,34 +123,34 @@ struct lu_ref {
         /**
          * Spin-lock protecting lu_ref::lf_list.
          */
-        spinlock_t       lf_guard;
+        cfs_spinlock_t       lf_guard;
         /**
          * List of all outstanding references (each represented by struct
          * lu_ref_link), pointing to this object.
          */
-        struct list_head lf_list;
+        cfs_list_t           lf_list;
         /**
          * # of links.
          */
-        short            lf_refs;
+        short                lf_refs;
         /**
          * Flag set when lu_ref_add() failed to allocate lu_ref_link. It is
          * used to mask spurious failure of the following lu_ref_del().
          */
-        short            lf_failed;
+        short                lf_failed;
         /**
          * flags - attribute for the lu_ref, for pad and future use.
          */
-        short            lf_flags;
+        short                lf_flags;
         /**
          * Where was I initialized?
          */
-        short            lf_line;
-        const char      *lf_func;
+        short                lf_line;
+        const char          *lf_func;
         /**
          * Linkage into a global list of all lu_ref's (lu_ref_refs).
          */
-        struct list_head lf_linkage;
+        cfs_list_t           lf_linkage;
 };
 
 void lu_ref_init_loc(struct lu_ref *ref, const char *func, const int line);