Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6: (131 commits) NFSv4: Fix a typo in nfs_inode_reclaim_delegation NFS: Add a boot parameter to disable 64 bit inode numbers NFS: nfs_refresh_inode should clear cache_validity flags on success NFS: Fix a connectathon regression in NFSv3 and NFSv4 NFS: Use nfs_refresh_inode() in ops that aren't expected to change the inode SUNRPC: Don't call xprt_release in call refresh SUNRPC: Don't call xprt_release() if call_allocate fails SUNRPC: Fix buggy UDP transmission [23/37] Clean up duplicate includes in [2.6 patch] net/sunrpc/rpcb_clnt.c: make struct rpcb_program static SUNRPC: Use correct type in buffer length calculations SUNRPC: Fix default hostname created in rpc_create() nfs: add server port to rpc_pipe info file NFS: Get rid of some obsolete macros NFS: Simplify filehandle revalidation NFS: Ensure that nfs_link() returns a hashed dentry NFS: Be strict about dentry revalidation when doing exclusive create NFS: Don't zap the readdir caches upon error NFS: Remove the redundant nfs_reval_fsid() NFSv3: Always use directory post-op attributes in nfs3_proc_lookup ... Fix up trivial conflict due to sock_owned_by_user() cleanup manually in net/sunrpc/xprtsock.c
Showing
此差异已折叠。
此差异已折叠。
include/linux/sunrpc/rpc_rdma.h
0 → 100644
include/linux/sunrpc/xprtrdma.h
0 → 100644
include/linux/sunrpc/xprtsock.h
0 → 100644
net/sunrpc/xprtrdma/Makefile
0 → 100644
net/sunrpc/xprtrdma/rpc_rdma.c
0 → 100644
此差异已折叠。
net/sunrpc/xprtrdma/transport.c
0 → 100644
此差异已折叠。
net/sunrpc/xprtrdma/verbs.c
0 → 100644
此差异已折叠。
net/sunrpc/xprtrdma/xprt_rdma.h
0 → 100644
此差异已折叠。
此差异已折叠。
想要评论请 注册 或 登录