Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.34' of git://linux-nfs.org/~bfields/linux: (22 commits) nfsd4: fix minor memory leak svcrpc: treat uid's as unsigned nfsd: ensure sockets are closed on error Revert "sunrpc: move the close processing after do recvfrom method" Revert "sunrpc: fix peername failed on closed listener" sunrpc: remove unnecessary svc_xprt_put NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN xfs_export_operations.commit_metadata commit_metadata export operation replacing nfsd_sync_dir lockd: don't clear sm_monitored on nsm_reboot_lookup lockd: release reference to nsm_handle in nlm_host_rebooted nfsd: Use vfs_fsync_range() in nfsd_commit NFSD: Create PF_INET6 listener in write_ports SUNRPC: NFS kernel APIs shouldn't return ENOENT for "transport not found" SUNRPC: Bury "#ifdef IPV6" in svc_create_xprt() NFSD: Support AF_INET6 in svc_addsock() function SUNRPC: Use rpc_pton() in ip_map_parse() nfsd: 4.1 has an rfc number nfsd41: Create the recovery entry for the NFSv4.1 client nfsd: use vfs_fsync for non-directories ...
Showing
- Documentation/filesystems/nfs/nfs41-server.txt 2 additions, 3 deletionsDocumentation/filesystems/nfs/nfs41-server.txt
- fs/lockd/host.c 1 addition, 1 deletionfs/lockd/host.c
- fs/lockd/mon.c 3 additions, 9 deletionsfs/lockd/mon.c
- fs/lockd/svc.c 0 additions, 2 deletionsfs/lockd/svc.c
- fs/nfs/callback.c 0 additions, 2 deletionsfs/nfs/callback.c
- fs/nfsd/nfs4callback.c 4 additions, 1 deletionfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4recover.c 1 addition, 3 deletionsfs/nfsd/nfs4recover.c
- fs/nfsd/nfs4state.c 3 additions, 1 deletionfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 1 addition, 1 deletionfs/nfsd/nfs4xdr.c
- fs/nfsd/nfsctl.c 18 additions, 6 deletionsfs/nfsd/nfsctl.c
- fs/nfsd/vfs.c 73 additions, 80 deletionsfs/nfsd/vfs.c
- fs/xfs/linux-2.6/xfs_export.c 20 additions, 0 deletionsfs/xfs/linux-2.6/xfs_export.c
- include/linux/exportfs.h 5 additions, 0 deletionsinclude/linux/exportfs.h
- net/sunrpc/svc_xprt.c 14 additions, 13 deletionsnet/sunrpc/svc_xprt.c
- net/sunrpc/svcauth_unix.c 27 additions, 22 deletionsnet/sunrpc/svcauth_unix.c
- net/sunrpc/svcsock.c 2 additions, 1 deletionnet/sunrpc/svcsock.c
Loading
Please register or sign in to comment