fscache: remove unused ->now_uncached callback

[sfrench/cifs-2.6.git] / fs / ceph / cache.c

diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c
index fd1172823f8621b6701e91172a0f0f83c2bb3f5c..174d6e6569a89a025037cf7dfc044e35236bb4b4 100644 (file)
--- a/fs/ceph/cache.c
+++ b/fs/ceph/cache.c
@@ -194,36 +194,6 @@ static enum fscache_checkaux ceph_fscache_inode_check_aux(
        return FSCACHE_CHECKAUX_OKAY;
 }
 
-static void ceph_fscache_inode_now_uncached(void* cookie_netfs_data)
-{
-       struct ceph_inode_info* ci = cookie_netfs_data;
-       struct pagevec pvec;
-       pgoff_t first;
-       int loop, nr_pages;
-
-       pagevec_init(&pvec, 0);
-       first = 0;
-
-       dout("ceph inode 0x%p now uncached", ci);
-
-       while (1) {
-               nr_pages = pagevec_lookup(&pvec, ci->vfs_inode.i_mapping, first,
-                                         PAGEVEC_SIZE - pagevec_count(&pvec));
-
-               if (!nr_pages)
-                       break;
-
-               for (loop = 0; loop < nr_pages; loop++)
-                       ClearPageFsCache(pvec.pages[loop]);
-
-               first = pvec.pages[nr_pages - 1]->index + 1;
-
-               pvec.nr = nr_pages;
-               pagevec_release(&pvec);
-               cond_resched();
-       }
-}
-
 static const struct fscache_cookie_def ceph_fscache_inode_object_def = {
        .name           = "CEPH.inode",
        .type           = FSCACHE_COOKIE_TYPE_DATAFILE,
@@ -231,7 +201,6 @@ static const struct fscache_cookie_def ceph_fscache_inode_object_def = {
        .get_attr       = ceph_fscache_inode_get_attr,
        .get_aux        = ceph_fscache_inode_get_aux,
        .check_aux      = ceph_fscache_inode_check_aux,
-       .now_uncached   = ceph_fscache_inode_now_uncached,
 };
 
 void ceph_fscache_register_inode_cookie(struct inode *inode)
@@ -297,13 +266,7 @@ void ceph_fscache_file_set_cookie(struct inode *inode, struct file *filp)
        }
 }
 
-static void ceph_vfs_readpage_complete(struct page *page, void *data, int error)
-{
-       if (!error)
-               SetPageUptodate(page);
-}
-
-static void ceph_vfs_readpage_complete_unlock(struct page *page, void *data, int error)
+static void ceph_readpage_from_fscache_complete(struct page *page, void *data, int error)
 {
        if (!error)
                SetPageUptodate(page);
@@ -331,7 +294,7 @@ int ceph_readpage_from_fscache(struct inode *inode, struct page *page)
                return -ENOBUFS;
 
        ret = fscache_read_or_alloc_page(ci->fscache, page,
-                                        ceph_vfs_readpage_complete, NULL,
+                                        ceph_readpage_from_fscache_complete, NULL,
                                         GFP_KERNEL);
 
        switch (ret) {
@@ -360,7 +323,7 @@ int ceph_readpages_from_fscache(struct inode *inode,
                return -ENOBUFS;
 
        ret = fscache_read_or_alloc_pages(ci->fscache, mapping, pages, nr_pages,
-                                         ceph_vfs_readpage_complete_unlock,
+                                         ceph_readpage_from_fscache_complete,
                                          NULL, mapping_gfp_mask(mapping));
 
        switch (ret) {