Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
* 'for-linus' of git://linux-nfs.org/~bfields/linux: (100 commits) SUNRPC: RPC program information is stored in unsigned integers SUNRPC: Move exported symbol definitions after function declaration part 2 NLM: tear down RPC clients in nlm_shutdown_hosts SUNRPC: spin svc_rqst initialization to its own function nfsd: more careful input validation in nfsctl write methods lockd: minor log message fix knfsd: don't bother mapping putrootfh enoent to eperm rdma: makefile rdma: ONCRPC RDMA protocol marshalling rdma: SVCRDMA sendto rdma: SVCRDMA recvfrom rdma: SVCRDMA Core Transport Services rdma: SVCRDMA Transport Module rdma: SVCRMDA Header File svc: Add svc_xprt_names service to replace svc_sock_names knfsd: Support adding transports by writing portlist file svc: Add svc API that queries for a transport instance svc: Add /proc/sys/sunrpc/transport files svc: Add transport hdr size for defer/revisit svc: Move the xprt independent code to the svc_xprt.c file ...
Showing
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- fs/Kconfig 2 additions, 0 deletionsfs/Kconfig
- fs/lockd/host.c 17 additions, 9 deletionsfs/lockd/host.c
- fs/lockd/svc.c 17 additions, 22 deletionsfs/lockd/svc.c
- fs/lockd/svc4proc.c 12 additions, 8 deletionsfs/lockd/svc4proc.c
- fs/lockd/svclock.c 12 additions, 8 deletionsfs/lockd/svclock.c
- fs/lockd/svcproc.c 13 additions, 9 deletionsfs/lockd/svcproc.c
- fs/lockd/svcsubs.c 1 addition, 1 deletionfs/lockd/svcsubs.c
- fs/nfs/callback.c 2 additions, 2 deletionsfs/nfs/callback.c
- fs/nfsd/auth.h 0 additions, 5 deletionsfs/nfsd/auth.h
- fs/nfsd/export.c 11 additions, 9 deletionsfs/nfsd/export.c
- fs/nfsd/nfs2acl.c 6 additions, 1 deletionfs/nfsd/nfs2acl.c
- fs/nfsd/nfs3xdr.c 11 additions, 10 deletionsfs/nfsd/nfs3xdr.c
- fs/nfsd/nfs4callback.c 44 additions, 48 deletionsfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4idmap.c 15 additions, 13 deletionsfs/nfsd/nfs4idmap.c
- fs/nfsd/nfs4proc.c 1 addition, 1 deletionfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4state.c 96 additions, 161 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 29 additions, 7 deletionsfs/nfsd/nfs4xdr.c
- fs/nfsd/nfscache.c 12 additions, 16 deletionsfs/nfsd/nfscache.c
- fs/nfsd/nfsctl.c 103 additions, 21 deletionsfs/nfsd/nfsctl.c
Loading
Please register or sign in to comment