Hi Bruce, these don't seem too controversial, and could be merged in v5.10 if you agree they are ready. --- Chuck Lever (8): lockd: Replace PROC() macro with open code NFSACL: Replace PROC() macro with open code NFSD: Encoder and decoder functions are always present NFSD: Clean up switch statement in nfsd_dispatch() NFSD: Clean up stale comments in nfsd_dispatch() NFSD: Clean up nfsd_dispatch() variables NFSD: Refactor nfsd_dispatch() error paths NFSD: Set *statp in success path J. Bruce Fields (1): nfsd: rq_lease_breaker cleanup fs/lockd/svc4proc.c | 242 +++++++++++++++++++++++++++-------- fs/lockd/svcproc.c | 244 ++++++++++++++++++++++++++++-------- fs/nfsd/nfs2acl.c | 78 ++++++++---- fs/nfsd/nfs3acl.c | 50 +++++--- fs/nfsd/nfs3proc.c | 1 + fs/nfsd/nfs3xdr.c | 6 + fs/nfsd/nfs4proc.c | 1 + fs/nfsd/nfs4xdr.c | 6 + fs/nfsd/nfssvc.c | 105 +++++++++------- fs/nfsd/xdr3.h | 1 + fs/nfsd/xdr4.h | 1 + include/uapi/linux/nfsacl.h | 2 + 12 files changed, 548 insertions(+), 189 deletions(-) -- Chuck Lever