diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index bbede57781754b6bbf818ed22019e2b7a00e5ef6..bb5e8b14883b099c664d8363aa9cefeb2968af80 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -122,6 +122,27 @@ LB_LINUX_TRY_COMPILE([
])
])
+#
+# LC_FUNC_RELEASEPAGE_WITH_GFP
+#
+# if ->releasepage() takes a gfp_t arg in 2.6.9
+# This kernel defines gfp_t (HAS_GFP_T) but doesn't use it for this function,
+# while others either don't have gfp_t or pass gfp_t as the parameter.
+#
+AC_DEFUN([LC_FUNC_RELEASEPAGE_WITH_GFP],
+[AC_MSG_CHECKING([if releasepage has a gfp_t parameter])
+RELEASEPAGE_WITH_GFP="`grep -c 'releasepage.*gfp_t'
+$LINUX/include/linux/fs.h`"
+if test "$RELEASEPAGE_WITH_GFP" != 0 ; then
+ AC_DEFINE(HAVE_RELEASEPAGE_WITH_GFP, 1,
+ [releasepage with gfp_t parameter])
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+fi
+])
+
+
#
# LC_FUNC_ZAP_PAGE_RANGE
#
@@ -891,7 +912,7 @@ LB_LINUX_TRY_COMPILE([
# LC_INODE_I_MUTEX
# after 2.6.15 inode have i_mutex intead of i_sem
AC_DEFUN([LC_INODE_I_MUTEX],
-[AC_MSG_CHECKING([use inode have i_mutex ])
+[AC_MSG_CHECKING([if inode has i_mutex ])
LB_LINUX_TRY_COMPILE([
#include <linux/mutex.h>
#include <linux/fs.h>
@@ -905,7 +926,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_INODE_I_MUTEX, 1,
[after 2.6.15 inode have i_mutex intead of i_sem])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -926,7 +947,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_DQUOTOFF_MUTEX, 1,
[after 2.6.17 dquote use mutex instead if semaphore])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -986,7 +1007,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_INVALIDATEPAGE_RETURN_INT, 1,
[Define if return type of invalidatepage should be int])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -1015,7 +1036,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_UMOUNTBEGIN_VFSMOUNT, 1,
[Define umount_begin need second argument])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
EXTRA_KCFLAGS="$tmp_flags"
])
@@ -1034,7 +1055,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_INODE_BLKSIZE, 1,
[struct inode has i_blksize field])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -1061,7 +1082,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_VFS_READDIR_U64_INO, 1,
[if vfs_readdir need 64bit inode number])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
EXTRA_KCFLAGS="$tmp_flags"
])
@@ -1080,7 +1101,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_GENERIC_FILE_WRITE, 1,
[use generic_file_write])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -1098,7 +1119,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_GENERIC_FILE_READ, 1,
[use generic_file_read])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -1115,7 +1136,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_NR_PAGECACHE, 1,
[is kernel export nr_pagecache])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -1134,7 +1155,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_CANCEL_DIRTY_PAGE, 1,
[kernel has cancel_dirty_page instead of clear_page_dirty])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -1178,7 +1199,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_PG_FS_MISC, 1,
[is kernel have PG_fs_misc])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -1200,7 +1221,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_PAGE_CHECKED, 1,
[does kernel have PageChecked and SetPageChecked])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
@@ -1870,7 +1891,7 @@ LB_LINUX_TRY_COMPILE([
AC_DEFINE(HAVE_SECURITY_PLUG, 1,
[SLES10 SP2 use extra parameter in vfs])
],[
- AC_MSG_RESULT(NO)
+ AC_MSG_RESULT(no)
])
])
diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index b0bd2d3a47d44af47d61b96200a48c26c0d72442..39585881d51758c6090ec86a75961877fe750fef 100644
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -93,7 +93,13 @@ static void ll_invalidatepage(struct page *page, unsigned long offset)
ll_removepage(page);
}
#endif
-static int ll_releasepage(struct page *page, gfp_t gfp_mask)
+
+#ifdef HAVE_RELEASEPAGE_WITH_GFP
+#define RELEASEPAGE_ARG_TYPE gfp_t
+#else
+#define RELEASEPAGE_ARG_TYPE int
+#endif
+static int ll_releasepage(struct page *page, RELEASEPAGE_ARG_TYPE gfp_mask)
{
if (PagePrivate(page))
ll_removepage(page);
@@ -104,11 +110,11 @@ static int ll_set_page_dirty(struct page *page)
{
struct ll_async_page *llap;
ENTRY;
-
+
llap = llap_from_page(page, LLAP_ORIGIN_UNKNOWN);
if (IS_ERR(llap))
RETURN(PTR_ERR(llap));
-
+
llap_write_pending(page->mapping->host, llap);
RETURN(__set_page_dirty_nobuffers(page));
}
@@ -183,7 +189,7 @@ static ssize_t ll_direct_IO_26_seg(int rw, struct inode *inode,
pga[i].pg = pages[i];
pga[i].off = file_offset;
/* To the end of the page, or the length, whatever is less */
- pga[i].count = min_t(int, CFS_PAGE_SIZE -
+ pga[i].count = min_t(int, CFS_PAGE_SIZE -
(file_offset & ~CFS_PAGE_MASK),
length);
pga[i].flag = 0;
@@ -262,7 +268,7 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
oinfo.oi_md = lsm;
oinfo.oi_capa = ll_osscapa_get(inode, opc);
- /* need locking between buffered and direct access. and race with
+ /* need locking between buffered and direct access. and race with
*size changing by concurrent truncates and writes. */
if (rw == READ)
LOCK_INODE_MUTEX(inode);
@@ -332,7 +338,7 @@ out:
if (tot_bytes > 0) {
int rc;
-
+
rc = ptlrpc_set_wait(set);
if (rc) {
tot_bytes = rc;