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>

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index ade8a7e..1a50dfe 100644 (file)
--- 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 (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)
                        /* 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)
                 * or continue and drop the oldest below
                 */
                if (net_random()&1)

-                       return 0;
+                       return -ENOMEM;

        }
        dreq = req->defer(req);
        if (dreq == NULL)
        }
        dreq = req->defer(req);
        if (dreq == NULL)

-               return 0;
+               return -ENOMEM;

 
        dreq->item = item;
 
 
        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);
        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)
 }
 
 static void cache_revisit_request(struct cache_head *item)