Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "LU-2800 autoconf: remove LC_PROCFS_USERS test"
[fs/lustre-release.git]
/
lustre
/
obdclass
/
cl_page.c
diff --git
a/lustre/obdclass/cl_page.c
b/lustre/obdclass/cl_page.c
index
e837d30
..
b7dfab1
100644
(file)
--- a/
lustre/obdclass/cl_page.c
+++ b/
lustre/obdclass/cl_page.c
@@
-64,7
+64,7
@@
static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg,
((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
#endif /* !LIBCFS_DEBUG */
((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
#endif /* !LIBCFS_DEBUG */
-#ifdef
INVARIANT
_CHECK
+#ifdef
CONFIG_LUSTRE_DEBUG_EXPENSIVE
_CHECK
# define PINVRNT(env, page, expr) \
do { \
if (unlikely(!(expr))) { \
# define PINVRNT(env, page, expr) \
do { \
if (unlikely(!(expr))) { \
@@
-72,10
+72,10
@@
static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg,
LINVRNT(0); \
} \
} while (0)
LINVRNT(0); \
} \
} while (0)
-#else /* !
INVARIANT
_CHECK */
+#else /* !
CONFIG_LUSTRE_DEBUG_EXPENSIVE
_CHECK */
# define PINVRNT(env, page, exp) \
# define PINVRNT(env, page, exp) \
- ((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
-#endif /* !
INVARIANT
_CHECK */
+ ((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
+#endif /* !
CONFIG_LUSTRE_DEBUG_EXPENSIVE
_CHECK */
/* Disable page statistic by default due to huge performance penalty. */
#ifdef CONFIG_DEBUG_PAGESTATE_TRACKING
/* Disable page statistic by default due to huge performance penalty. */
#ifdef CONFIG_DEBUG_PAGESTATE_TRACKING
@@
-323,7
+323,7
@@
static struct cl_page *cl_page_alloc(const struct lu_env *env,
ENTRY;
OBD_ALLOC_GFP(page, cl_object_header(o)->coh_page_bufsize,
ENTRY;
OBD_ALLOC_GFP(page, cl_object_header(o)->coh_page_bufsize,
-
CFS_ALLOC
_IO);
+
__GFP
_IO);
if (page != NULL) {
int result = 0;
cfs_atomic_set(&page->cp_ref, 1);
if (page != NULL) {
int result = 0;
cfs_atomic_set(&page->cp_ref, 1);
@@
-655,7
+655,7
@@
EXPORT_SYMBOL(cl_page_put);
/**
* Returns a VM page associated with a given cl_page.
*/
/**
* Returns a VM page associated with a given cl_page.
*/
-
cfs_page_t
*cl_page_vmpage(const struct lu_env *env, struct cl_page *page)
+
struct page
*cl_page_vmpage(const struct lu_env *env, struct cl_page *page)
{
const struct cl_page_slice *slice;
{
const struct cl_page_slice *slice;
@@
-678,7
+678,7
@@
EXPORT_SYMBOL(cl_page_vmpage);
/**
* Returns a cl_page associated with a VM page, and given cl_object.
*/
/**
* Returns a cl_page associated with a VM page, and given cl_object.
*/
-struct cl_page *cl_vmpage_page(
cfs_page_t
*vmpage, struct cl_object *obj)
+struct cl_page *cl_vmpage_page(
struct page
*vmpage, struct cl_object *obj)
{
struct cl_page *top;
struct cl_page *page;
{
struct cl_page *top;
struct cl_page *page;
@@
-1575,10
+1575,7
@@
EXPORT_SYMBOL(cl_page_cancel);
*/
loff_t cl_offset(const struct cl_object *obj, pgoff_t idx)
{
*/
loff_t cl_offset(const struct cl_object *obj, pgoff_t idx)
{
- /*
- * XXX for now.
- */
- return (loff_t)idx << CFS_PAGE_SHIFT;
+ return (loff_t)idx << PAGE_CACHE_SHIFT;
}
EXPORT_SYMBOL(cl_offset);
}
EXPORT_SYMBOL(cl_offset);
@@
-1587,16
+1584,13
@@
EXPORT_SYMBOL(cl_offset);
*/
pgoff_t cl_index(const struct cl_object *obj, loff_t offset)
{
*/
pgoff_t cl_index(const struct cl_object *obj, loff_t offset)
{
- /*
- * XXX for now.
- */
- return offset >> CFS_PAGE_SHIFT;
+ return offset >> PAGE_CACHE_SHIFT;
}
EXPORT_SYMBOL(cl_index);
int cl_page_size(const struct cl_object *obj)
{
}
EXPORT_SYMBOL(cl_index);
int cl_page_size(const struct cl_object *obj)
{
-
return 1 << CFS_PAG
E_SHIFT;
+
return 1 << PAGE_CACH
E_SHIFT;
}
EXPORT_SYMBOL(cl_page_size);
}
EXPORT_SYMBOL(cl_page_size);