From: Christoph Lameter Use page_cache_xxx in fs/libfs.c Reviewed-by: Dave Chinner Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- fs/libfs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff -puN fs/libfs.c~use-page_cache_xxx-in-fs-libfsc fs/libfs.c --- a/fs/libfs.c~use-page_cache_xxx-in-fs-libfsc +++ a/fs/libfs.c @@ -17,7 +17,8 @@ int simple_getattr(struct vfsmount *mnt, { struct inode *inode = dentry->d_inode; generic_fillattr(inode, stat); - stat->blocks = inode->i_mapping->nrpages << (PAGE_CACHE_SHIFT - 9); + stat->blocks = inode->i_mapping->nrpages << + (page_cache_shift(inode->i_mapping) - 9); return 0; } @@ -341,10 +342,10 @@ int simple_prepare_write(struct file *fi unsigned from, unsigned to) { if (!PageUptodate(page)) { - if (to - from != PAGE_CACHE_SIZE) + if (to - from != page_cache_size(file->f_mapping)) zero_user_segments(page, 0, from, - to, PAGE_CACHE_SIZE); + to, page_cache_size(file->f_mapping)); } return 0; } @@ -372,8 +373,9 @@ int simple_write_begin(struct file *file static int simple_commit_write(struct file *file, struct page *page, unsigned from, unsigned to) { - struct inode *inode = page->mapping->host; - loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to; + struct address_space *mapping = page->mapping; + struct inode *inode = mapping->host; + loff_t pos = page_cache_pos(mapping, page->index, to); if (!PageUptodate(page)) SetPageUptodate(page); _