Skip to content

Commit

Permalink
sunrpc/cache: change cache_defer_req to return -ve error, not boolean.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
NeilBrown authored and J. Bruce Fields committed Sep 11, 2009
1 parent 4cfc7e6 commit 9e4c637
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions net/sunrpc/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 9e4c637

Please sign in to comment.