LU-2858 mdt: check .lustre before reint operation.

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

diff --git a/lustre/include/lclient.h b/lustre/include/lclient.h
index 2ca110b..93169c7 100644 (file)
--- a/lustre/include/lclient.h
+++ b/lustre/include/lclient.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -99,7 +99,6 @@ struct ccc_io {
 
         union {
                 struct {
-                        int                        cui_locks_released;
                         enum ccc_setattr_lock_type cui_local_lock;
                 } setattr;
         } u;
@@ -215,7 +214,7 @@ struct ccc_object {
         *
         * \see ll_dirty_page_discard_warn.
         */
-       int                     cob_discard_page_warned:1;
+       unsigned int            cob_discard_page_warned:1;
 };
 
 /**
@@ -441,7 +440,7 @@ void ccc_inode_lsm_put(struct inode *inode, struct lov_stripe_md *lsm);
 struct cl_client_cache {
        cfs_atomic_t    ccc_users;    /* # of users (OSCs) of this data */
        cfs_list_t      ccc_lru;      /* LRU list of cached clean pages */
-       cfs_spinlock_t  ccc_lru_lock; /* lock for list */
+       spinlock_t      ccc_lru_lock; /* lock for list */
        cfs_atomic_t    ccc_lru_left; /* # of LRU entries available */
        unsigned long   ccc_lru_max;  /* Max # of LRU entries possible */
        unsigned int    ccc_lru_shrinkers; /* # of threads reclaiming */