From b2327e1a7980c9769f52f21a50c472dbfa888576 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Tue, 21 Jun 2016 16:36:30 +1000 Subject: [PATCH] mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros Source kernel commit 09cbfeaf1a5a67bfb3201e0c83c810cecb2efa5a PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time ago with promise that one day it will be possible to implement page cache with bigger chunks than PAGE_SIZE. This promise never materialized. And unlikely will. [....] Signed-off-by: Kirill A. Shutemov Acked-by: Michal Hocko Signed-off-by: Linus Torvalds Signed-off-by: Dave Chinner --- libxfs/libxfs_priv.h | 2 +- libxfs/xfs_bmap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 2c5aba0c8..c14faca00 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -195,7 +195,7 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC }; */ #define prandom_u32() 0 -#define PAGE_CACHE_SIZE getpagesize() +#define PAGE_SIZE getpagesize() static inline int __do_div(unsigned long long *n, unsigned base) { diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 49e2913c0..cbcfd72f7 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -3734,11 +3734,11 @@ xfs_bmap_btalloc( args.prod = align; if ((args.mod = (xfs_extlen_t)do_mod(ap->offset, args.prod))) args.mod = (xfs_extlen_t)(args.prod - args.mod); - } else if (mp->m_sb.sb_blocksize >= PAGE_CACHE_SIZE) { + } else if (mp->m_sb.sb_blocksize >= PAGE_SIZE) { args.prod = 1; args.mod = 0; } else { - args.prod = PAGE_CACHE_SIZE >> mp->m_sb.sb_blocklog; + args.prod = PAGE_SIZE >> mp->m_sb.sb_blocklog; if ((args.mod = (xfs_extlen_t)(do_mod(ap->offset, args.prod)))) args.mod = (xfs_extlen_t)(args.prod - args.mod); } -- 2.47.2