LU-1546 mdd: return nlink as zero for dead objects

[fs/lustre-release.git] / lnet / selftest / console.h

diff --git a/lnet/selftest/console.h b/lnet/selftest/console.h
index 6ea5ac5..5f61a86 100644 (file)
--- a/lnet/selftest/console.h
+++ b/lnet/selftest/console.h
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -132,7 +134,7 @@ typedef struct lstcon_test {
 #define LST_CONSOLE_TIMEOUT     300             /* default console timeout */
 
 typedef struct {
-        cfs_mutex_t             ses_mutex;      /* lock for session, only one thread can enter session */
+       struct mutex            ses_mutex;      /* only 1 thread in session */
         lst_sid_t               ses_id;         /* global session id */
         int                     ses_key;        /* local session key */
         int                     ses_state;      /* state of session */
@@ -160,7 +162,7 @@ typedef struct {
         cfs_list_t              ses_ndl_list;   /* global list of nodes */
         cfs_list_t             *ses_ndl_hash;   /* hash table of nodes */
 
-        cfs_spinlock_t          ses_rpc_lock;   /* serialize */
+       spinlock_t          ses_rpc_lock;   /* serialize */
         cfs_atomic_t            ses_rpc_counter;/* # of initialized RPCs */
         cfs_list_t              ses_rpc_freelist; /* idle console rpc */
 } lstcon_session_t;                             /*** session descriptor */