projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 092f623 5304930)
Merge tag 'nfsd-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jan 2023 21:03:06 +0000 (15:03 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jan 2023 21:03:06 +0000 (15:03 -0600)
Pull nfsd fixes from Chuck Lever:

 - Fix a race when creating NFSv4 files

 - Revert the use of relaxed bitops

* tag 'nfsd-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  NFSD: Use set_bit(RQ_DROPME)
  Revert "SUNRPC: Use RMW bitops in single-threaded hot paths"
  nfsd: fix handling of cached open files in nfsd4_open codepath

1  2 
fs/nfsd/nfs4state.c patch | diff1 | diff2 | blob | history
net/sunrpc/svc.c patch | diff1 | diff2 | blob | history
net/sunrpc/svcsock.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfsd/nfs4state.c
Simple merge
diff --cc net/sunrpc/svc.c
Simple merge
diff --cc net/sunrpc/svcsock.c
Simple merge
Domain: System / Kernel;