Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.30' of git://linux-nfs.org/~bfields/linux: svcrdma: dma unmap the correct length for the RPCRDMA header page. nfsd: Revert "svcrpc: take advantage of tcp autotuning" nfsd: fix hung up of nfs client while sync write data to nfs server
Showing
- fs/nfsd/vfs.c 3 additions, 3 deletionsfs/nfsd/vfs.c
- net/sunrpc/svcsock.c 28 additions, 7 deletionsnet/sunrpc/svcsock.c
- net/sunrpc/xprtrdma/svc_rdma_sendto.c 6 additions, 6 deletionsnet/sunrpc/xprtrdma/svc_rdma_sendto.c
- net/sunrpc/xprtrdma/svc_rdma_transport.c 5 additions, 5 deletionsnet/sunrpc/xprtrdma/svc_rdma_transport.c
Loading
Please register or sign in to comment