Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
* 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (44 commits) NFSv4: Don't use the delegation->inode in nfs_mark_return_delegation() nfs: don't use d_move in nfs_async_rename_done RDMA: Increasing RPCRDMA_MAX_DATA_SEGS SUNRPC: Replace xprt->resend and xprt->sending with a priority queue SUNRPC: Allow caller of rpc_sleep_on() to select priority levels SUNRPC: Support dynamic slot allocation for TCP connections SUNRPC: Clean up the slot table allocation SUNRPC: Initalise the struct xprt upon allocation SUNRPC: Ensure that we grab the XPRT_LOCK before calling xprt_alloc_slot pnfs: simplify pnfs files module autoloading nfs: document nfsv4 sillyrename issues NFS: Convert nfs4_set_ds_client to EXPORT_SYMBOL_GPL SUNRPC: Convert the backchannel exports to EXPORT_SYMBOL_GPL SUNRPC: sunrpc should not explicitly depend on NFS config options NFS: Clean up - simplify the switch to read/write-through-MDS NFS: Move the pnfs write code into pnfs.c NFS: Move the pnfs read code into pnfs.c NFS: Allow the nfs_pageio_descriptor to signal that a re-coalesce is needed NFS: Use the nfs_pageio_descriptor->pg_bsize in the read/write request NFS: Cache rpc_ops in struct nfs_pageio_descriptor ...
No related branches found
No related tags found
Showing
- fs/lockd/clntproc.c 6 additions, 3 deletionsfs/lockd/clntproc.c
- fs/nfs/Kconfig 1 addition, 0 deletionsfs/nfs/Kconfig
- fs/nfs/callback_proc.c 36 additions, 21 deletionsfs/nfs/callback_proc.c
- fs/nfs/client.c 3 additions, 4 deletionsfs/nfs/client.c
- fs/nfs/delegation.c 8 additions, 8 deletionsfs/nfs/delegation.c
- fs/nfs/internal.h 13 additions, 0 deletionsfs/nfs/internal.h
- fs/nfs/namespace.c 1 addition, 1 deletionfs/nfs/namespace.c
- fs/nfs/nfs4_fs.h 5 additions, 0 deletionsfs/nfs/nfs4_fs.h
- fs/nfs/nfs4filelayout.c 72 additions, 8 deletionsfs/nfs/nfs4filelayout.c
- fs/nfs/nfs4filelayout.h 15 additions, 2 deletionsfs/nfs/nfs4filelayout.h
- fs/nfs/nfs4filelayoutdev.c 338 additions, 114 deletionsfs/nfs/nfs4filelayoutdev.c
- fs/nfs/nfs4proc.c 209 additions, 6 deletionsfs/nfs/nfs4proc.c
- fs/nfs/nfs4state.c 8 additions, 1 deletionfs/nfs/nfs4state.c
- fs/nfs/nfs4xdr.c 246 additions, 1 deletionfs/nfs/nfs4xdr.c
- fs/nfs/objlayout/objio_osd.c 16 additions, 4 deletionsfs/nfs/objlayout/objio_osd.c
- fs/nfs/pagelist.c 60 additions, 9 deletionsfs/nfs/pagelist.c
- fs/nfs/pnfs.c 188 additions, 33 deletionsfs/nfs/pnfs.c
- fs/nfs/pnfs.h 31 additions, 43 deletionsfs/nfs/pnfs.h
- fs/nfs/pnfs_dev.c 31 additions, 33 deletionsfs/nfs/pnfs_dev.c
- fs/nfs/read.c 94 additions, 72 deletionsfs/nfs/read.c
Loading
Please register or sign in to comment