Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-3.13' of git://linux-nfs.org/~bfields/linux
Pull nfsd reply cache bugfix from Bruce Fields:
"One bugfix for nfsd crashes"
* 'for-3.13' of git://linux-nfs.org/~bfields/linux:
nfsd: when reusing an existing repcache entry, unhash it first
+8
-1
+8
-1
fs/nfsd/nfscache.c
+8
-1
fs/nfsd/nfscache.c
···
132
132
}
133
133
134
134
static void
135
+
nfsd_reply_cache_unhash(struct svc_cacherep *rp)
136
+
{
137
+
hlist_del_init(&rp->c_hash);
138
+
list_del_init(&rp->c_lru);
139
+
}
140
+
141
+
static void
135
142
nfsd_reply_cache_free_locked(struct svc_cacherep *rp)
136
143
{
137
144
if (rp->c_type == RC_REPLBUFF && rp->c_replvec.iov_base) {
···
424
417
rp = list_first_entry(&lru_head, struct svc_cacherep, c_lru);
425
418
if (nfsd_cache_entry_expired(rp) ||
426
419
num_drc_entries >= max_drc_entries) {
427
-
lru_put_end(rp);
420
+
nfsd_reply_cache_unhash(rp);
428
421
prune_cache_entries();
429
422
goto search_cache;
430
423
}