From: David Howells <dhowells@redhat.com>
To: torvalds@linux-foundation.org
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
dhowells@redhat.com, linux-cachefs@redhat.com,
linux-fsdevel@vger.kernel.org, linux-afs@lists.infradead.org
Subject: [PATCH 04/12] fscache, cachefiles: Fix checker warnings
Date: Wed, 04 Apr 2018 23:07:09 +0100 [thread overview]
Message-ID: <152287962922.14760.8383895930885499464.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <152287959470.14760.10350886166577848180.stgit@warthog.procyon.org.uk>
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>
---
fs/cachefiles/rdwr.c | 1 +
fs/fscache/stats.c | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
index 883bc7bb12c5..5082c8a49686 100644
--- a/fs/cachefiles/rdwr.c
+++ b/fs/cachefiles/rdwr.c
@@ -952,6 +952,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
* - 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 7ac6e839b065..fcc8c2f2690e 100644
--- 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;
next prev parent reply other threads:[~2018-04-04 22:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-04 22:06 [PATCH net-next 00/12] fscache: Fixes, traces and development David Howells
2018-04-04 22:06 ` [PATCH 01/12] afs: Invalidate cache on server data change David Howells
2018-04-04 22:06 ` [PATCH 02/12] afs: Use the vnode ID uniquifier in the cache key not the aux data David Howells
2018-04-04 22:07 ` [PATCH 03/12] afs: Be more aggressive in retiring cached vnodes David Howells
2018-04-04 22:07 ` David Howells [this message]
2018-04-04 22:07 ` [PATCH 05/12] fscache: Pass the correct cancelled indications to fscache_op_complete() David Howells
2018-04-04 22:07 ` [PATCH 06/12] fscache: Detect multiple relinquishment of a cookie David Howells
2018-04-04 22:53 ` Linus Torvalds
2018-04-04 22:07 ` [PATCH 07/12] fscache: Fix hanging wait on page discarded by writeback David Howells
2018-04-04 22:07 ` [PATCH 08/12] fscache: Add tracepoints David Howells
2018-04-04 22:07 ` [PATCH 09/12] fscache: Add more tracepoints David Howells
2018-04-04 22:07 ` [PATCH 10/12] fscache: Attach the index key and aux data to the cookie David Howells
2018-04-04 22:07 ` [PATCH 11/12] fscache: Pass object size in rather than calling back for it David Howells
2018-04-04 22:08 ` [PATCH 12/12] fscache: Maintain a catalogue of allocated cookies David Howells
2018-04-04 22:10 ` [PATCH net-next 00/12] fscache: Fixes, traces and development David Howells
2018-04-06 14:44 ` David Howells
2018-04-06 18:21 ` Linus Torvalds
2018-04-06 18:32 ` Linus Torvalds
2018-04-06 19:28 ` David Howells
2018-04-06 19:40 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=152287962922.14760.8383895930885499464.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=linux-afs@lists.infradead.org \
--cc=linux-cachefs@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).