Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[mirror_ubuntu-artful-kernel.git] / fs / ceph / inode.c

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 8b3da8adbbe3232e3fd8e3be88d1576871c8fed2..04c89c266cecffa2396d0b63774d4811063bbb0f 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -869,7 +869,7 @@ static int fill_inode(struct inode *inode,
                                __ceph_get_fmode(ci, cap_fmode);
                }
        } else if (cap_fmode >= 0) {
-               pr_warning("mds issued no caps on %llx.%llx\n",
+               pr_warn("mds issued no caps on %llx.%llx\n",
                           ceph_vinop(inode));
                __ceph_get_fmode(ci, cap_fmode);
        }
@@ -1546,7 +1546,7 @@ static void ceph_invalidate_work(struct work_struct *work)
        orig_gen = ci->i_rdcache_gen;
        spin_unlock(&ci->i_ceph_lock);
 
-       truncate_inode_pages(inode->i_mapping, 0);
+       truncate_pagecache(inode, 0);
 
        spin_lock(&ci->i_ceph_lock);
        if (orig_gen == ci->i_rdcache_gen &&
@@ -1649,7 +1649,7 @@ retry:
             ci->i_truncate_pending, to);
        spin_unlock(&ci->i_ceph_lock);
 
-       truncate_inode_pages(inode->i_mapping, to);
+       truncate_pagecache(inode, to);
 
        spin_lock(&ci->i_ceph_lock);
        if (to == ci->i_truncate_size) {