The following cleanups apply on top of the nfs-for-next branch, and is designed to allow the objects and blocks code to use different read/write block sizes than the write-through-MDS. It also pushes a lot of the pNFS code back down into pnfs.c where it belongs... Cheers Trond Trond Myklebust (8): NFS: Clean up nfs_read_rpcsetup and nfs_write_rpcsetup NFS: Clean up: split out the RPC transmission from nfs_pagein_multi/one NFS: Cache rpc_ops in struct nfs_pageio_descriptor NFS: Use the nfs_pageio_descriptor->pg_bsize in the read/write request NFS: Allow the nfs_pageio_descriptor to signal that a re-coalesce is needed NFS: Move the pnfs read code into pnfs.c NFS: Move the pnfs write code into pnfs.c NFS: Clean up - simplify the switch to read/write-through-MDS fs/nfs/internal.h | 12 +++-- fs/nfs/nfs4filelayout.c | 9 ++-- fs/nfs/objlayout/objio_osd.c | 4 +- fs/nfs/pagelist.c | 57 +++++++++++++++++++- fs/nfs/pnfs.c | 118 ++++++++++++++++++++++++++++++++++++++-- fs/nfs/pnfs.h | 20 +------ fs/nfs/read.c | 121 ++++++++++++++++++++++-------------------- fs/nfs/write.c | 119 +++++++++++++++++++++++------------------ include/linux/nfs_page.h | 8 +-- include/linux/nfs_xdr.h | 2 + 10 files changed, 317 insertions(+), 153 deletions(-) -- 1.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html