dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

sunrpc/cache: change cache_defer_req to return -ve error, not boolean. 

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>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
NeilBrown 2009-09-09 16:32:54 +10:00 committed by J. Bruce Fields
parent 4cfc7e6019
commit 9e4c6379a6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/sunrpc/cache.c
View File

@ -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)