Skip to content

Commit 61a5f34

Browse files
author
Herton R. Krzesinski
committed
Merge: Follow-up fixes for nfsd for 9.2
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1846 Bugzilla: https://bugzilla.redhat.com/2138605 Bugzilla: https://bugzilla.redhat.com/2138321 Bugzilla: https://bugzilla.redhat.com/2138357 Bugzilla: https://bugzilla.redhat.com/2152473 Bugzilla: https://bugzilla.redhat.com/2152996 Most of these are centered around the filecache stabilization patches which have recently gone upstream, but there are a few other recent fixes sprinkled in here too. Signed-off-by: Jeffrey Layton <jlayton@redhat.com> Approved-by: Scott Mayhew <smayhew@redhat.com> Approved-by: Benjamin Coddington <bcodding@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents e2fd918 + c02afdc commit 61a5f34

File tree

21 files changed

+648
-521
lines changed

21 files changed

+648
-521
lines changed

fs/nfsd/cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@ int nfsd_reply_cache_init(struct nfsd_net *);
8484
void nfsd_reply_cache_shutdown(struct nfsd_net *);
8585
int nfsd_cache_lookup(struct svc_rqst *);
8686
void nfsd_cache_update(struct svc_rqst *, int, __be32 *);
87-
int nfsd_reply_cache_stats_open(struct inode *, struct file *);
87+
int nfsd_reply_cache_stats_show(struct seq_file *m, void *v);
8888

8989
#endif /* NFSCACHE_H */

0 commit comments

Comments
 (0)