Branch HEAD

[fs/lustre-release.git] / lustre / llite / rw26.c

diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index 001b761..f82c41b 100644 (file)
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -1,5 +1,4 @@
-/*
- * -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
  * GPL HEADER START
@@ -17,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -94,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_INT
+#define RELEASEPAGE_ARG_TYPE int
+#else
+#define RELEASEPAGE_ARG_TYPE gfp_t
+#endif
+static int ll_releasepage(struct page *page, RELEASEPAGE_ARG_TYPE gfp_mask)
 {
         if (PagePrivate(page))
                 ll_removepage(page);
@@ -105,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));
 }
@@ -184,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;
@@ -263,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);
@@ -333,7 +338,7 @@ out:
 
         if (tot_bytes > 0) {
                 int rc;
-                
+
                 rc = ptlrpc_set_wait(set);
                 if (rc) {
                         tot_bytes = rc;