|  | 
| 29 | 29 | 
 | 
| 30 | 30 | #define NFSD_FILE_LRU_RESCAN		     (0) | 
| 31 | 31 | #define NFSD_FILE_SHUTDOWN		     (1) | 
| 32 |  | -#define NFSD_FILE_LRU_THRESHOLD		     (4096UL) | 
| 33 |  | -#define NFSD_FILE_LRU_LIMIT		     (NFSD_FILE_LRU_THRESHOLD << 2) | 
| 34 | 32 | 
 | 
| 35 | 33 | /* We only care about NFSD_MAY_READ/WRITE for this cache */ | 
| 36 | 34 | #define NFSD_FILE_MAY_MASK	(NFSD_MAY_READ|NFSD_MAY_WRITE) | 
| @@ -66,8 +64,6 @@ static struct delayed_work		nfsd_filecache_laundrette; | 
| 66 | 64 | static DEFINE_SPINLOCK(laundrette_lock); | 
| 67 | 65 | static LIST_HEAD(laundrettes); | 
| 68 | 66 | 
 | 
| 69 |  | -static void nfsd_file_gc(void); | 
| 70 |  | - | 
| 71 | 67 | static void | 
| 72 | 68 | nfsd_file_schedule_laundrette(void) | 
| 73 | 69 | { | 
| @@ -317,8 +313,6 @@ nfsd_file_put(struct nfsd_file *nf) | 
| 317 | 313 | 	set_bit(NFSD_FILE_REFERENCED, &nf->nf_flags); | 
| 318 | 314 | 	if (nfsd_file_put_noref(nf) == 1 && is_hashed && unused) | 
| 319 | 315 | 		nfsd_file_schedule_laundrette(); | 
| 320 |  | -	if (atomic_long_read(&nfsd_filecache_count) >= NFSD_FILE_LRU_LIMIT) | 
| 321 |  | -		nfsd_file_gc(); | 
| 322 | 316 | } | 
| 323 | 317 | 
 | 
| 324 | 318 | struct nfsd_file * | 
| @@ -1044,8 +1038,7 @@ nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, | 
| 1044 | 1038 | 	nfsd_file_hashtbl[hashval].nfb_maxcount = max(nfsd_file_hashtbl[hashval].nfb_maxcount, | 
| 1045 | 1039 | 			nfsd_file_hashtbl[hashval].nfb_count); | 
| 1046 | 1040 | 	spin_unlock(&nfsd_file_hashtbl[hashval].nfb_lock); | 
| 1047 |  | -	if (atomic_long_inc_return(&nfsd_filecache_count) >= NFSD_FILE_LRU_THRESHOLD) | 
| 1048 |  | -		nfsd_file_gc(); | 
|  | 1041 | +	atomic_long_inc(&nfsd_filecache_count); | 
| 1049 | 1042 | 
 | 
| 1050 | 1043 | 	nf->nf_mark = nfsd_file_mark_find_or_create(nf); | 
| 1051 | 1044 | 	if (nf->nf_mark) { | 
|  | 
0 commit comments