X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_io.c;h=c041c8e91c9a89105a658bcb3fd9c4e7c0d4e75e;hb=6350af100c204a4db794e7472951ab72c3bc20ef;hp=ea3485237d749f31818166b44faaee56a25ab3fe;hpb=25a36d277be36c5143a7583d4c5c46380afa0fdc;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_io.c b/lustre/osd-zfs/osd_io.c
index ea34852..c041c8e 100644
--- a/lustre/osd-zfs/osd_io.c
+++ b/lustre/osd-zfs/osd_io.c
@@ -28,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  */
 /*
@@ -41,14 +41,10 @@
  * Author: Mike Pershin <tappro@whamcloud.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_OSD
 
 #include <lustre_ver.h>
 #include <libcfs/libcfs.h>
-#include <lustre_fsfilt.h>
 #include <obd_support.h>
 #include <lustre_net.h>
 #include <obd.h>
@@ -242,16 +238,12 @@ static int osd_bufs_put(const struct lu_env *env, struct dt_object *dt,
 	return 0;
 }
 
-static struct page *kmem_to_page(void *addr)
+static inline struct page *kmem_to_page(void *addr)
 {
-	struct page *page;
-
-	if (kmem_virt(addr))
-		page = vmalloc_to_page(addr);
+	if (is_vmalloc_addr(addr))
+		return vmalloc_to_page(addr);
 	else
-		page = virt_to_page(addr);
-
-	return page;
+		return virt_to_page(addr);
 }
 
 static int osd_bufs_get_read(const struct lu_env *env, struct osd_object *obj,
@@ -292,8 +284,8 @@ static int osd_bufs_get_read(const struct lu_env *env, struct osd_object *obj,
 			dbf = (void *) ((unsigned long)dbp[i] | 1);
 
 			while (tocpy > 0) {
-				thispage = CFS_PAGE_SIZE;
-				thispage -= bufoff & (CFS_PAGE_SIZE - 1);
+				thispage = PAGE_CACHE_SIZE;
+				thispage -= bufoff & (PAGE_CACHE_SIZE - 1);
 				thispage = min(tocpy, thispage);
 
 				lnb->rc = 0;
@@ -366,7 +358,7 @@ static int osd_bufs_get_write(const struct lu_env *env, struct osd_object *obj,
 			/* go over pages arcbuf contains, put them as
 			 * local niobufs for ptlrpc's bulks */
 			while (sz_in_block > 0) {
-				plen = min_t(int, sz_in_block, CFS_PAGE_SIZE);
+				plen = min_t(int, sz_in_block, PAGE_CACHE_SIZE);
 
 				lnb[i].lnb_file_offset = off;
 				lnb[i].lnb_page_offset = 0;
@@ -400,7 +392,7 @@ static int osd_bufs_get_write(const struct lu_env *env, struct osd_object *obj,
 
 			/* can't use zerocopy, allocate temp. buffers */
 			while (sz_in_block > 0) {
-				plen = min_t(int, sz_in_block, CFS_PAGE_SIZE);
+				plen = min_t(int, sz_in_block, PAGE_CACHE_SIZE);
 
 				lnb[i].lnb_file_offset = off;
 				lnb[i].lnb_page_offset = 0;