Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
index a9ff9a36b86d..7823e9ef995e 100644
--- a/include/linux/fscache-cache.h
+++ b/include/linux/fscache-cache.h
@@ -251,6 +251,10 @@ struct fscache_cache_ops {
         /* unpin an object in the cache */
         void (*unpin_object)(struct fscache_object *object);
 
+        /* check the consistency between the backing cache and the FS-Cache
+         * cookie */
+        bool (*check_consistency)(struct fscache_operation *op);
+
         /* store the updated auxiliary data on an object */
         void (*update_object)(struct fscache_object *object);