Merge tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / nfsd / nfscache.c

diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index 223b3b2..dbdeb9d 100644 (file)
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -395,7 +395,6 @@ nfsd_cache_lookup(struct svc_rqst *rqstp)
        __wsum                  csum;
        u32 hash = nfsd_cache_hash(xid);
        struct nfsd_drc_bucket *b = &drc_hashtbl[hash];
-       unsigned long           age;
        int type = rqstp->rq_cachetype;
        int rtn = RC_DOIT;
 
@@ -462,12 +461,11 @@ nfsd_cache_lookup(struct svc_rqst *rqstp)
 found_entry:
        nfsdstats.rchits++;
        /* We found a matching entry which is either in progress or done. */
-       age = jiffies - rp->c_timestamp;
        lru_put_end(b, rp);
 
        rtn = RC_DROPIT;
-       /* Request being processed or excessive rexmits */
-       if (rp->c_state == RC_INPROG || age < RC_DELAY)
+       /* Request being processed */
+       if (rp->c_state == RC_INPROG)
                goto out;
 
        /* From the hall of fame of impractical attacks: