Commit 0d345656 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman

staging/lustre/llite: merge lclient.h into llite/vvp_internal.h

Move the definition of struct cl_client_cache to
lustre/include/cl_object.h and move the rest of
lustre/include/lclient.h in to lustre/llite/vvp_internal.h.
Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-on: http://review.whamcloud.com/12592
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5971Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 902a34ad
...@@ -97,9 +97,12 @@ ...@@ -97,9 +97,12 @@
* super-class definitions. * super-class definitions.
*/ */
#include "lu_object.h" #include "lu_object.h"
#include <linux/atomic.h>
#include "linux/lustre_compat25.h" #include "linux/lustre_compat25.h"
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/radix-tree.h> #include <linux/radix-tree.h>
#include <linux/spinlock.h>
#include <linux/wait.h>
struct inode; struct inode;
...@@ -2317,6 +2320,39 @@ void cl_lock_descr_print(const struct lu_env *env, void *cookie, ...@@ -2317,6 +2320,39 @@ void cl_lock_descr_print(const struct lu_env *env, void *cookie,
const struct cl_lock_descr *descr); const struct cl_lock_descr *descr);
/* @} helper */ /* @} helper */
/**
* Data structure managing a client's cached pages. A count of
* "unstable" pages is maintained, and an LRU of clean pages is
* maintained. "unstable" pages are pages pinned by the ptlrpc
* layer for recovery purposes.
*/
struct cl_client_cache {
/**
* # of users (OSCs)
*/
atomic_t ccc_users;
/**
* # of threads are doing shrinking
*/
unsigned int ccc_lru_shrinkers;
/**
* # of LRU entries available
*/
atomic_t ccc_lru_left;
/**
* List of entities(OSCs) for this LRU cache
*/
struct list_head ccc_lru;
/**
* Max # of LRU entries
*/
unsigned long ccc_lru_max;
/**
* Lock to protect ccc_lru list
*/
spinlock_t ccc_lru_lock;
};
/** @} cl_page */ /** @} cl_page */
/** \defgroup cl_lock cl_lock /** \defgroup cl_lock cl_lock
......
This diff is collapsed.
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#include <linux/file.h> #include <linux/file.h>
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lclient.h"
#include "../llite/llite_internal.h" #include "../llite/llite_internal.h"
static const struct cl_lock_descr whole_file = { static const struct cl_lock_descr whole_file = {
......
...@@ -59,8 +59,6 @@ ...@@ -59,8 +59,6 @@
#include "../include/lustre_mdc.h" #include "../include/lustre_mdc.h"
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lclient.h"
#include "../llite/llite_internal.h" #include "../llite/llite_internal.h"
static const struct cl_req_operations ccc_req_ops; static const struct cl_req_operations ccc_req_ops;
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
#include "../include/obd_support.h" #include "../include/obd_support.h"
#include "../include/obd.h" #include "../include/obd.h"
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lclient.h"
#include "vvp_internal.h"
#include "../include/lustre_lite.h" #include "../include/lustre_lite.h"
/* Initialize the default and maximum LOV EA and cookie sizes. This allows /* Initialize the default and maximum LOV EA and cookie sizes. This allows
......
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
/* for struct cl_lock_descr and struct cl_io */ /* for struct cl_lock_descr and struct cl_io */
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lclient.h"
#include "../include/lustre_mdc.h" #include "../include/lustre_mdc.h"
#include "../include/lustre_intent.h" #include "../include/lustre_intent.h"
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/posix_acl_xattr.h> #include <linux/posix_acl_xattr.h>
#include "vvp_internal.h"
#ifndef FMODE_EXEC #ifndef FMODE_EXEC
#define FMODE_EXEC 0 #define FMODE_EXEC 0
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "../include/obd.h" #include "../include/obd.h"
#include "../include/lustre_lite.h" #include "../include/lustre_lite.h"
#include "llite_internal.h"
#include "vvp_internal.h" #include "vvp_internal.h"
static struct vvp_io *cl2vvp_io(const struct lu_env *env, static struct vvp_io *cl2vvp_io(const struct lu_env *env,
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "../include/obd.h" #include "../include/obd.h"
#include "../include/lustre_lite.h" #include "../include/lustre_lite.h"
#include "llite_internal.h"
#include "vvp_internal.h" #include "vvp_internal.h"
/***************************************************************************** /*****************************************************************************
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "../include/obd.h" #include "../include/obd.h"
#include "../include/lustre_lite.h" #include "../include/lustre_lite.h"
#include "llite_internal.h"
#include "vvp_internal.h" #include "vvp_internal.h"
/***************************************************************************** /*****************************************************************************
......
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
#include "../include/lprocfs_status.h" #include "../include/lprocfs_status.h"
#include "../include/lustre_param.h" #include "../include/lustre_param.h"
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lclient.h" /* for cl_client_lru */
#include "../include/lustre/ll_fiemap.h" #include "../include/lustre/ll_fiemap.h"
#include "../include/lustre_fid.h" #include "../include/lustre_fid.h"
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include "../include/obd.h" #include "../include/obd.h"
/* osc_build_res_name() */ /* osc_build_res_name() */
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lclient.h"
#include "osc_internal.h" #include "osc_internal.h"
/** \defgroup osc osc /** \defgroup osc osc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment