From: NeilBrown <neilb@suse.de>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-nfs@vger.kernel.org, NeilBrown <neilb@suse.de>
Subject: [PATCH 1/9] sunrpc/cache: change cache_defer_req to return -ve error, not boolean.
Date: Wed, 09 Sep 2009 16:32:54 +1000 [thread overview]
Message-ID: <20090909063254.20462.57204.stgit@notabene.brown> (raw)
In-Reply-To: <20090909062539.20462.67466.stgit-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
As "cache_defer_req" does not sound like a predicate, having it return
a boolean value can be confusing. It is more consistent to return
0 for success and negative for error.
Exactly what error code to return is not important as we don't
differentiate between reasons why the request wasn't deferred,
we only care about whether it was deferred or not.
Signed-off-by: NeilBrown <neilb@suse.de>
---
net/sunrpc/cache.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 1a61401..aafb0e7 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -255,7 +255,7 @@ int cache_check(struct cache_detail *detail,
}
if (rv == -EAGAIN) {
- if (cache_defer_req(rqstp, h) == 0) {
+ if (cache_defer_req(rqstp, h) < 0) {
/* Request is not deferred */
rv = cache_is_valid(detail, h);
if (rv == -EAGAIN)
@@ -511,11 +511,11 @@ static int cache_defer_req(struct cache_req *req, struct cache_head *item)
* or continue and drop the oldest below
*/
if (net_random()&1)
- return 0;
+ return -ENOMEM;
}
dreq = req->defer(req);
if (dreq == NULL)
- return 0;
+ return -ENOMEM;
dreq->item = item;
@@ -545,9 +545,9 @@ static int cache_defer_req(struct cache_req *req, struct cache_head *item)
if (!test_bit(CACHE_PENDING, &item->flags)) {
/* must have just been validated... */
cache_revisit_request(item);
- return 0;
+ return -EAGAIN;
}
- return 1;
+ return 0;
}
static void cache_revisit_request(struct cache_head *item)
next prev parent reply other threads:[~2009-09-09 6:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-09 6:32 [PATCH 0/9] Some improvements to request deferral and related code NeilBrown
[not found] ` <20090909062539.20462.67466.stgit-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
2009-09-09 6:32 ` [PATCH 7/9] nfsd/idmap: drop special request deferal in favour of improved default NeilBrown
[not found] ` <20090909063254.20462.80299.stgit-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
2009-12-02 22:18 ` J. Bruce Fields
2009-09-09 6:32 ` [PATCH 2/9] sunrpc/cache: simplify cache_fresh_locked and cache_fresh_unlocked NeilBrown
2009-09-09 6:32 ` [PATCH 6/9] sunrpc/cache: retry cache lookups that return -ETIMEDOUT NeilBrown
[not found] ` <20090909063254.20462.41616.stgit-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
2009-12-02 22:11 ` J. Bruce Fields
2009-12-03 16:57 ` J. Bruce Fields
2009-12-04 4:38 ` Neil Brown
[not found] ` <20091204153845.1ec83de5-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
2009-12-05 1:17 ` J. Bruce Fields
2009-12-15 6:27 ` Neil Brown
[not found] ` <20091215172729.5e1d0190-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
2010-02-01 17:11 ` J. Bruce Fields
2010-02-02 21:33 ` Neil Brown
2009-09-09 6:32 ` NeilBrown [this message]
[not found] ` <20090909063254.20462.57204.stgit-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
2009-09-11 21:03 ` [PATCH 1/9] sunrpc/cache: change cache_defer_req to return -ve error, not boolean J. Bruce Fields
2009-09-09 6:32 ` [PATCH 3/9] sunrpc/cache: use list_del_init for the list_head entries in cache_deferred_req NeilBrown
[not found] ` <20090909063254.20462.7969.stgit-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
2009-09-18 15:48 ` J. Bruce Fields
2009-09-09 6:32 ` [PATCH 4/9] sunrpc/cache: avoid variable over-loading in cache_defer_req NeilBrown
[not found] ` <20090909063254.20462.68582.stgit-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
2009-09-18 21:24 ` J. Bruce Fields
2009-09-09 6:32 ` [PATCH 5/9] sunrpc/cache: allow threads to block while waiting for cache update NeilBrown
[not found] ` <20090909063254.20462.99277.stgit-wvvUuzkyo1EYVZTmpyfIwg@public.gmane.org>
2009-12-02 20:59 ` J. Bruce Fields
2009-12-02 21:23 ` Trond Myklebust
2009-12-02 21:50 ` Trond Myklebust
2009-09-09 6:32 ` [PATCH 9/9] sunrpc: close connection when a request is irretrievably lost NeilBrown
2009-09-09 6:32 ` [PATCH 8/9] sunrpc/cache: change deferred-request hash table to use hlist NeilBrown
2009-09-11 21:07 ` [PATCH 0/9] Some improvements to request deferral and related code J. Bruce Fields
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=20090909063254.20462.57204.stgit@notabene.brown \
--to=neilb@suse.de \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.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