diff options
| author | Linus Torvalds | 2019-08-21 19:04:38 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-08-21 19:04:38 +0200 |
| commit | 2babd34df2294a72df02dc4a3745df3408147eba (patch) | |
| tree | a61dd4663e365ecf177ba767a2117f857551452a /fs/nfsd/nfscache.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid... (diff) | |
| parent | nfsd4: Fix kernel crash when reading proc file reply_cache_stats (diff) | |
| download | kernel-qcow2-linux-2babd34df2294a72df02dc4a3745df3408147eba.tar.gz kernel-qcow2-linux-2babd34df2294a72df02dc4a3745df3408147eba.tar.xz kernel-qcow2-linux-2babd34df2294a72df02dc4a3745df3408147eba.zip | |
Merge tag 'nfsd-5.3-1' of git://linux-nfs.org/~bfields/linux
Pull nfsd fixes from Bruce Fields:
"Fix nfsd bugs: three in the new nfsd/clients/ code, one in the reply
cache containerization"
* tag 'nfsd-5.3-1' of git://linux-nfs.org/~bfields/linux:
nfsd4: Fix kernel crash when reading proc file reply_cache_stats
nfsd: initialize i_private before d_add
nfsd: use i_wrlock instead of rcu for nfsdfs i_private
nfsd: fix dentry leak upon mkdir failure.
Diffstat (limited to 'fs/nfsd/nfscache.c')
| -rw-r--r-- | fs/nfsd/nfscache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index 26ad75ae2be0..96352ab7bd81 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -571,7 +571,7 @@ nfsd_cache_append(struct svc_rqst *rqstp, struct kvec *data) */ static int nfsd_reply_cache_stats_show(struct seq_file *m, void *v) { - struct nfsd_net *nn = v; + struct nfsd_net *nn = m->private; seq_printf(m, "max entries: %u\n", nn->max_drc_entries); seq_printf(m, "num entries: %u\n", |