Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux
Pull nfsd updates from Bruce Fields: - Handle some loose ends from the vfs read delegation support. (For example nfsd can stop breaking leases on its own in a fewer places where it can now depend on the vfs to.) - Make life a little easier for NFSv4-only configurations (thanks to Kinglong Mee). - Fix some gss-proxy problems (thanks Jeff Layton). - miscellaneous bug fixes and cleanup * 'for-3.14' of git://linux-nfs.org/~bfields/linux: (38 commits) nfsd: consider CLAIM_FH when handing out delegation nfsd4: fix delegation-unlink/rename race nfsd4: delay setting current_fh in open nfsd4: minor nfs4_setlease cleanup gss_krb5: use lcm from kernel lib nfsd4: decrease nfsd4_encode_fattr stack usage nfsd: fix encode_entryplus_baggage stack usage nfsd4: simplify xdr encoding of nfsv4 names nfsd4: encode_rdattr_error cleanup nfsd4: nfsd4_encode_fattr cleanup minor svcauth_gss.c cleanup nfsd4: better VERIFY comment nfsd4: break only delegations when appropriate NFSD: Fix a memory leak in nfsd4_create_session sunrpc: get rid of use_gssp_lock sunrpc: fix potential race between setting use_gss_proxy and the upcall rpc_clnt sunrpc: don't wait for write before allowing reads from use-gss-proxy file nfsd: get rid of unused function definition Define op_iattr for nfsd4_open instead using macro NFSD: fix compile warning without CONFIG_NFSD_V3 ...
No related branches found
No related tags found
Showing
- Documentation/filesystems/nfs/nfs41-server.txt 14 additions, 28 deletionsDocumentation/filesystems/nfs/nfs41-server.txt
- fs/nfsd/acl.h 1 addition, 1 deletionfs/nfsd/acl.h
- fs/nfsd/cache.h 0 additions, 8 deletionsfs/nfsd/cache.h
- fs/nfsd/idmap.h 2 additions, 2 deletionsfs/nfsd/idmap.h
- fs/nfsd/netns.h 1 addition, 0 deletionsfs/nfsd/netns.h
- fs/nfsd/nfs3xdr.c 7 additions, 7 deletionsfs/nfsd/nfs3xdr.c
- fs/nfsd/nfs4acl.c 13 additions, 7 deletionsfs/nfsd/nfs4acl.c
- fs/nfsd/nfs4idmap.c 33 additions, 17 deletionsfs/nfsd/nfs4idmap.c
- fs/nfsd/nfs4proc.c 34 additions, 23 deletionsfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4state.c 25 additions, 15 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 62 additions, 116 deletionsfs/nfsd/nfs4xdr.c
- fs/nfsd/nfscache.c 4 additions, 32 deletionsfs/nfsd/nfscache.c
- fs/nfsd/nfssvc.c 25 additions, 5 deletionsfs/nfsd/nfssvc.c
- fs/nfsd/nfsxdr.c 1 addition, 1 deletionfs/nfsd/nfsxdr.c
- fs/nfsd/vfs.c 7 additions, 33 deletionsfs/nfsd/vfs.c
- fs/nfsd/vfs.h 0 additions, 2 deletionsfs/nfsd/vfs.h
- fs/nfsd/xdr3.h 3 additions, 0 deletionsfs/nfsd/xdr3.h
- fs/nfsd/xdr4.h 1 addition, 3 deletionsfs/nfsd/xdr4.h
- include/linux/sunrpc/svc.h 4 additions, 2 deletionsinclude/linux/sunrpc/svc.h
- net/sunrpc/auth_gss/gss_krb5_keys.c 4 additions, 13 deletionsnet/sunrpc/auth_gss/gss_krb5_keys.c
Loading
Please register or sign in to comment