X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flclient.h;h=c6ea23512718abe63891653cb341fb804d380013;hb=823147fa760752c8c2ff11a5bd74f71f819f9e4e;hp=3016c083ef57cdda47d122ea8c7116681a4f3fbe;hpb=48eceeec98da3db2c93d980bb5f7e1c1f7c333cc;p=fs%2Flustre-release.git

diff --git a/lustre/include/lclient.h b/lustre/include/lclient.h
index 3016c08..c6ea235 100644
--- a/lustre/include/lclient.h
+++ b/lustre/include/lclient.h
@@ -205,14 +205,14 @@ struct ccc_object {
          *
          * \see ccc_page::cpg_pending_linkage
          */
-        cfs_list_t             cob_pending_list;
+	struct list_head	cob_pending_list;
 
-        /**
-         * Access this counter is protected by inode->i_sem. Now that
-         * the lifetime of transient pages must be covered by inode sem,
-         * we don't need to hold any lock..
-         */
-        int                     cob_transient_pages;
+	/**
+	 * Number of transient pages.  This is no longer protected by i_sem,
+	 * and needs to be atomic.  This is not actually used for anything,
+	 * and can probably be removed.
+	 */
+	atomic_t		cob_transient_pages;
 	/**
 	 * Number of outstanding mmaps on this file.
 	 *
@@ -350,6 +350,7 @@ void ccc_lock_delete(const struct lu_env *env,
 void ccc_lock_fini(const struct lu_env *env,struct cl_lock_slice *slice);
 int ccc_lock_enqueue(const struct lu_env *env,const struct cl_lock_slice *slice,
                      struct cl_io *io, __u32 enqflags);
+int ccc_lock_use(const struct lu_env *env,const struct cl_lock_slice *slice);
 int ccc_lock_unuse(const struct lu_env *env,const struct cl_lock_slice *slice);
 int ccc_lock_wait(const struct lu_env *env,const struct cl_lock_slice *slice);
 int ccc_lock_fits_into(const struct lu_env *env,
@@ -462,13 +463,17 @@ struct cl_client_cache {
 	 */
 	atomic_t		ccc_users;
 	/**
+	 * # of threads are doing shrinking
+	 */
+	unsigned int		ccc_lru_shrinkers;
+	/**
 	 * # of LRU entries available
 	 */
-	atomic_t		ccc_lru_left;
+	atomic_long_t		ccc_lru_left;
 	/**
 	 * List of entities(OSCs) for this LRU cache
 	 */
-	cfs_list_t		ccc_lru;
+	struct list_head	ccc_lru;
 	/**
 	 * Max # of LRU entries
 	 */
@@ -478,22 +483,18 @@ struct cl_client_cache {
 	 */
 	spinlock_t		ccc_lru_lock;
 	/**
-	 * # of threads are doing shrinking
-	 */
-	unsigned int		ccc_lru_shrinkers;
-	/**
 	 * Set if unstable check is enabled
 	 */
 	unsigned int		ccc_unstable_check:1;
 	/**
+	 * # of unstable pages for this mount point
+	 */
+	atomic_long_t		ccc_unstable_nr;
+	/**
 	 * Waitq for awaiting unstable pages to reach zero.
 	 * Used at umounting time and signaled on BRW commit
 	 */
 	wait_queue_head_t	ccc_unstable_waitq;
-	/**
-	 * # of unstable pages for this mount point
-	 */
-	atomic_t		ccc_unstable_nr;
 };
 
 enum {
@@ -510,7 +511,6 @@ enum op_cli_flags {
 	CLI_HASH64	= 1 << 2,
 	CLI_API32	= 1 << 3,
 	CLI_MIGRATE	= 1 << 4,
-	CLI_NEXT_ENTRY	= 1 << 5,
 };
 
 #endif /*LCLIENT_H */