Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'nfsd-5.9-1' of git://git.linux-nfs.org/projects/cel/cel-2.6

Pull nfs server fixes from Chuck Lever:

- Eliminate an oops introduced in v5.8

- Remove a duplicate #include added by nfsd-5.9

* tag 'nfsd-5.9-1' of git://git.linux-nfs.org/projects/cel/cel-2.6:
SUNRPC: remove duplicate include
nfsd: fix oops on mixed NFSv4/NFSv3 client access

+2 -1
+2
fs/nfsd/nfs4state.c
··· 4597 4597 if (!i_am_nfsd()) 4598 4598 return NULL; 4599 4599 rqst = kthread_data(current); 4600 + if (!rqst->rq_lease_breaker) 4601 + return NULL; 4600 4602 clp = *(rqst->rq_lease_breaker); 4601 4603 return dl->dl_stid.sc_client == clp; 4602 4604 }
-1
net/sunrpc/auth_gss/trace.c
··· 9 9 #include <linux/sunrpc/svc_xprt.h> 10 10 #include <linux/sunrpc/auth_gss.h> 11 11 #include <linux/sunrpc/gss_err.h> 12 - #include <linux/sunrpc/auth_gss.h> 13 12 14 13 #define CREATE_TRACE_POINTS 15 14 #include <trace/events/rpcgss.h>