X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdecho%2Fecho.c;h=a9886edc5a49cf319b753c9c79cf2d5d5420e5cc;hp=107fab1feae149737a09566630d4745513bf53f2;hb=6ea4de1b7f237d331c9e0d66f4cc53365d036e5d;hpb=3b84a1ee5213563945225854a50e9037bb9646db;ds=sidebyside

diff --git a/lustre/obdecho/echo.c b/lustre/obdecho/echo.c
index 107fab1..a9886ed 100644
--- a/lustre/obdecho/echo.c
+++ b/lustre/obdecho/echo.c
@@ -229,7 +229,7 @@ static void
 echo_page_debug_setup(struct page *page, int rw, u64 id,
 		      __u64 offset, int len)
 {
-	int   page_offset = offset & ~CFS_PAGE_MASK;
+	int   page_offset = offset & ~PAGE_MASK;
 	char *addr        = ((char *)kmap(page)) + page_offset;
 
         if (len % OBD_ECHO_BLOCK_SIZE != 0)
@@ -256,7 +256,7 @@ static int
 echo_page_debug_check(struct page *page, u64 id,
 		      __u64 offset, int len)
 {
-	int   page_offset = offset & ~CFS_PAGE_MASK;
+	int   page_offset = offset & ~PAGE_MASK;
 	char *addr        = ((char *)kmap(page)) + page_offset;
 	int   rc          = 0;
 	int   rc2;
@@ -309,7 +309,7 @@ static int echo_map_nb_to_lb(struct obdo *oa, struct obd_ioobj *obj,
 
 		res->lnb_file_offset = offset;
 		res->lnb_len = plen;
-		LASSERT((res->lnb_file_offset & ~CFS_PAGE_MASK) +
+		LASSERT((res->lnb_file_offset & ~PAGE_MASK) +
 			res->lnb_len <= PAGE_CACHE_SIZE);
 
 		if (ispersistent &&