Patched in Tegra support.

1 files changed, 6 insertions, 44 deletions

diff --git a/include/linux/fscache.h b/include/linux/fscache.h
index 7a086235da4..9ec20dec335 100644
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
@@ -135,14 +135,14 @@ struct fscache_cookie_def {
          */
         void (*put_context)(void *cookie_netfs_data, void *context);
 
-        /* indicate page that now have cache metadata retained
-         * - this function should mark the specified page as now being cached
-         * - the page will have been marked with PG_fscache before this is
+        /* indicate pages that now have cache metadata retained
+         * - this function should mark the specified pages as now being cached
+         * - the pages will have been marked with PG_fscache before this is
          *   called, so this is optional
          */
-        void (*mark_page_cached)(void *cookie_netfs_data,
-                                 struct address_space *mapping,
-                                 struct page *page);
+        void (*mark_pages_cached)(void *cookie_netfs_data,
+                                  struct address_space *mapping,
+                                  struct pagevec *cached_pvec);
 
         /* indicate the cookie is no longer cached
          * - this function is called when the backing store currently caching
@@ -185,8 +185,6 @@ extern struct fscache_cookie *__fscache_acquire_cookie(
 extern void __fscache_relinquish_cookie(struct fscache_cookie *, int);
 extern void __fscache_update_cookie(struct fscache_cookie *);
 extern int __fscache_attr_changed(struct fscache_cookie *);
-extern void __fscache_invalidate(struct fscache_cookie *);
-extern void __fscache_wait_on_invalidate(struct fscache_cookie *);
 extern int __fscache_read_or_alloc_page(struct fscache_cookie *,
                                         struct page *,
                                         fscache_rw_complete_t,
@@ -392,42 +390,6 @@ int fscache_attr_changed(struct fscache_cookie *cookie)
 }
 
 /**
- * fscache_invalidate - Notify cache that an object needs invalidation
- * @cookie: The cookie representing the cache object
- *
- * Notify the cache that an object is needs to be invalidated and that it
- * should abort any retrievals or stores it is doing on the cache.  The object
- * is then marked non-caching until such time as the invalidation is complete.
- *
- * This can be called with spinlocks held.
- *
- * See Documentation/filesystems/caching/netfs-api.txt for a complete
- * description.
- */
-static inline
-void fscache_invalidate(struct fscache_cookie *cookie)
-{
-        if (fscache_cookie_valid(cookie))
-                __fscache_invalidate(cookie);
-}
-
-/**
- * fscache_wait_on_invalidate - Wait for invalidation to complete
- * @cookie: The cookie representing the cache object
- *
- * Wait for the invalidation of an object to complete.
- *
- * See Documentation/filesystems/caching/netfs-api.txt for a complete
- * description.
- */
-static inline
-void fscache_wait_on_invalidate(struct fscache_cookie *cookie)
-{
-        if (fscache_cookie_valid(cookie))
-                __fscache_wait_on_invalidate(cookie);
-}
-
-/**
  * fscache_reserve_space - Reserve data space for a cached object
  * @cookie: The cookie representing the cache object
  * @i_size: The amount of space to be reserved