]> www.infradead.org Git - users/hch/configfs.git/commitdiff
projects / users / hch / configfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 825ec75 c88c150)
Merge tag 'nfsd-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Oct 2024 16:52:49 +0000 (09:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Oct 2024 16:52:49 +0000 (09:52 -0700)
Pull nfsd fixes from Chuck Lever:

 - Fix NFSD bring-up / shutdown

 - Fix a UAF when releasing a stateid

* tag 'nfsd-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: fix possible badness in FREE_STATEID
  nfsd: nfsd_destroy_serv() must call svc_destroy() even if nfsd_startup_net() failed
  NFSD: Mark filecache "down" if init fails

1  2 
fs/nfsd/filecache.c patch | diff1 | diff2 | blob | history
fs/nfsd/nfssvc.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfsd/filecache.c
Simple merge
diff --cc fs/nfsd/nfssvc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.