fscache, cachefiles: Fix checker warnings

Fix a couple of checker warnings in fscache and cachefiles:

 (1) fscache_n_op_requeue is never used, so get rid of it.

 (2) cachefiles_uncache_page() is passed in a lock that it releases, so
     this needs annotating.

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
index 883bc7bb12c5625ffa3698dcc0dce40a13c3c3cf..5082c8a496866dcab1740c63088f7d8f21fb1c5a 100644 (file)
--- a/fs/cachefiles/rdwr.c
+++ b/fs/cachefiles/rdwr.c
@@ -952,6 +952,7 @@ error:
  * - cache withdrawal is prevented by the caller
  */
 void cachefiles_uncache_page(struct fscache_object *_object, struct page *page)
+       __releases(&object->fscache.cookie->lock)
 {
        struct cachefiles_object *object;
        struct cachefiles_cache *cache;

diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
index 7ac6e839b065b5327a0590732b542fda2ed3ab0d..fcc8c2f2690e496ddd3c6d4aa1ad1b13d4c16ca5 100644 (file)
--- a/fs/fscache/stats.c
+++ b/fs/fscache/stats.c
@@ -21,7 +21,6 @@
 atomic_t fscache_n_op_pend;
 atomic_t fscache_n_op_run;
 atomic_t fscache_n_op_enqueue;
-atomic_t fscache_n_op_requeue;
 atomic_t fscache_n_op_deferred_release;
 atomic_t fscache_n_op_initialised;
 atomic_t fscache_n_op_release;