Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
Pull nfsd updates from Bruce Fields: "Highlights: - server-side nfs/rdma fixes from Jeff Layton and Tom Tucker - xdr fixes (a larger xdr rewrite has been posted but I decided it would be better to queue it up for 3.16). - miscellaneous fixes and cleanup from all over (thanks especially to Kinglong Mee)" * 'for-3.15' of git://linux-nfs.org/~bfields/linux: (36 commits) nfsd4: don't create unnecessary mask acl nfsd: revert v2 half of "nfsd: don't return high mode bits" nfsd4: fix memory leak in nfsd4_encode_fattr() nfsd: check passed socket's net matches NFSd superblock's one SUNRPC: Clear xpt_bc_xprt if xs_setup_bc_tcp failed NFSD/SUNRPC: Check rpc_xprt out of xs_setup_bc_tcp SUNRPC: New helper for creating client with rpc_xprt NFSD: Free backchannel xprt in bc_destroy NFSD: Clear wcc data between compound ops nfsd: Don't return NFS4ERR_STALE_STATEID for NFSv4.1+ nfsd4: fix nfs4err_resource in 4.1 case nfsd4: fix setclientid encode size nfsd4: remove redundant check from nfsd4_check_resp_size nfsd4: use more generous NFS4_ACL_MAX nfsd4: minor nfsd4_replay_cache_entry cleanup nfsd4: nfsd4_replay_cache_entry should be static nfsd4: update comments with obsolete function name rpc: Allow xdr_buf_subsegment to operate in-place NFSD: Using free_conn free connection SUNRPC: fix memory leak of peer addresses in XPRT ...
No related branches found
No related tags found
Showing
- fs/lockd/svc.c 1 addition, 0 deletionsfs/lockd/svc.c
- fs/nfsd/acl.h 7 additions, 3 deletionsfs/nfsd/acl.h
- fs/nfsd/nfs4acl.c 9 additions, 4 deletionsfs/nfsd/nfs4acl.c
- fs/nfsd/nfs4callback.c 18 additions, 1 deletionfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4proc.c 25 additions, 14 deletionsfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4state.c 14 additions, 14 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 24 additions, 6 deletionsfs/nfsd/nfs4xdr.c
- fs/nfsd/nfsctl.c 5 additions, 0 deletionsfs/nfsd/nfsctl.c
- fs/nfsd/nfsd.h 1 addition, 1 deletionfs/nfsd/nfsd.h
- fs/nfsd/nfsfh.h 13 additions, 1 deletionfs/nfsd/nfsfh.h
- fs/nfsd/nfsxdr.c 1 addition, 1 deletionfs/nfsd/nfsxdr.c
- fs/nfsd/vfs.c 12 additions, 3 deletionsfs/nfsd/vfs.c
- fs/nfsd/xdr4.h 0 additions, 2 deletionsfs/nfsd/xdr4.h
- include/linux/sunrpc/clnt.h 2 additions, 0 deletionsinclude/linux/sunrpc/clnt.h
- include/linux/sunrpc/svcsock.h 1 addition, 0 deletionsinclude/linux/sunrpc/svcsock.h
- include/linux/sunrpc/xprt.h 12 additions, 1 deletioninclude/linux/sunrpc/xprt.h
- net/sunrpc/Kconfig 26 additions, 13 deletionsnet/sunrpc/Kconfig
- net/sunrpc/Makefile 2 additions, 1 deletionnet/sunrpc/Makefile
- net/sunrpc/clnt.c 33 additions, 25 deletionsnet/sunrpc/clnt.c
- net/sunrpc/svcsock.c 16 additions, 0 deletionsnet/sunrpc/svcsock.c
Loading
Please register or sign in to comment