X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Ftracefile.h;h=196ab96edf4ee31b6c9f76d0dbbe7025f36397db;hb=1b2547843817b4b7adbeb87ea9b070d9cac35c90;hp=968c128aeb94a4f9ed21d30139ecb19f22e07ab6;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/tracefile.h b/libcfs/libcfs/tracefile.h
index 968c128..196ab96 100644
--- a/libcfs/libcfs/tracefile.h
+++ b/libcfs/libcfs/tracefile.h
@@ -92,7 +92,7 @@ extern void libcfs_unregister_panic_notifier(void);
 extern int  libcfs_panic_in_progress;
 extern int  cfs_trace_max_debug_mb(void);
 
-#define TCD_MAX_PAGES (5 << (20 - CFS_PAGE_SHIFT))
+#define TCD_MAX_PAGES (5 << (20 - PAGE_CACHE_SHIFT))
 #define TCD_STOCK_PAGES (TCD_MAX_PAGES)
 #define CFS_TRACEFILE_SIZE (500 << 20)
 
@@ -101,7 +101,7 @@ extern int  cfs_trace_max_debug_mb(void);
 /*
  * Private declare for tracefile
  */
-#define TCD_MAX_PAGES (5 << (20 - CFS_PAGE_SHIFT))
+#define TCD_MAX_PAGES (5 << (20 - PAGE_CACHE_SHIFT))
 #define TCD_STOCK_PAGES (TCD_MAX_PAGES)
 
 #define CFS_TRACEFILE_SIZE (500 << 20)
@@ -239,7 +239,7 @@ struct cfs_trace_page {
 	/*
 	 * page itself
 	 */
-	cfs_page_t          *page;
+	struct page          *page;
 	/*
 	 * linkage into one of the lists in trace_data_union or
 	 * page_collection
@@ -337,8 +337,8 @@ do {                                                                    \
 do {                                                                    \
         __LASSERT(tage != NULL);                                        \
         __LASSERT(tage->page != NULL);                                  \
-        __LASSERT(tage->used <= CFS_PAGE_SIZE);                         \
-        __LASSERT(cfs_page_count(tage->page) > 0);                      \
+	__LASSERT(tage->used <= PAGE_CACHE_SIZE);                         \
+	__LASSERT(page_count(tage->page) > 0);                      \
 } while (0)
 
 #endif	/* LUSTRE_TRACEFILE_PRIVATE */