[09/36] Use page_cache_xxx in fs/libfs.c

[clameter]

Use page_cache_xxx in fs/libfs.c

Signed-off-by: Christoph Lameter <[EMAIL PROTECTED]>
---
 fs/libfs.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fs/libfs.c b/fs/libfs.c
index 53b3dc5..e90f894 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -16,7 +16,8 @@ int simple_getattr(struct vfsmount *mnt, struct dentry 
*dentry,
 {
        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;
 }
 
@@ -340,10 +341,10 @@ int simple_prepare_write(struct file *file, struct page 
*page,
                        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;
 }
@@ -351,8 +352,9 @@ int simple_prepare_write(struct file *file, struct page 
*page,
 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);
-- 
1.5.2.4

-- 
-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html