Commit 01f3bd1f authored by J.Bruce Fields's avatar J.Bruce Fields Committed by Linus Torvalds

[PATCH] knfsd: svcrpc: remove another silent drop from deferral code

There's no point deferring something just to immediately fail the deferral,
especially now that we can do something more useful in the failure case by
returning an error.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e0bb89ef
...@@ -530,6 +530,13 @@ static int cache_defer_req(struct cache_req *req, struct cache_head *item) ...@@ -530,6 +530,13 @@ static int cache_defer_req(struct cache_req *req, struct cache_head *item)
struct cache_deferred_req *dreq; struct cache_deferred_req *dreq;
int hash = DFR_HASH(item); int hash = DFR_HASH(item);
if (cache_defer_cnt >= DFR_MAX) {
/* too much in the cache, randomly drop this one,
* or continue and drop the oldest below
*/
if (net_random()&1)
return -ETIMEDOUT;
}
dreq = req->defer(req); dreq = req->defer(req);
if (dreq == NULL) if (dreq == NULL)
return -ETIMEDOUT; return -ETIMEDOUT;
...@@ -548,17 +555,8 @@ static int cache_defer_req(struct cache_req *req, struct cache_head *item) ...@@ -548,17 +555,8 @@ static int cache_defer_req(struct cache_req *req, struct cache_head *item)
/* it is in, now maybe clean up */ /* it is in, now maybe clean up */
dreq = NULL; dreq = NULL;
if (++cache_defer_cnt > DFR_MAX) { if (++cache_defer_cnt > DFR_MAX) {
/* too much in the cache, randomly drop dreq = list_entry(cache_defer_list.prev,
* first or last struct cache_deferred_req, recent);
*/
if (net_random()&1)
dreq = list_entry(cache_defer_list.next,
struct cache_deferred_req,
recent);
else
dreq = list_entry(cache_defer_list.prev,
struct cache_deferred_req,
recent);
list_del(&dreq->recent); list_del(&dreq->recent);
list_del(&dreq->hash); list_del(&dreq->hash);
cache_defer_cnt--; cache_defer_cnt--;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment