This patchset is more cleanup related to the recent pgio changes. These patches are on top of trond's testing branch and can be found in my "pgio_plus" branch at: git://git.linux-nfs.org/projects/dros/linux-nfs Most of these patches are dealing with the merge of nfs_pgio_data into nfs_pgio_header. My recent patchset "[PATCH v3 00/18] nfs: support multiple requests per page" changes the pgio layer so that an nfs_pgio_header only ever has one nfs_pgio_data, which allows us to simplify a lot of things. Updates in v3: - rebased to trond/testing - moved nfs_generic_pgio_reset back to nfs_pgio_data_destroy in "nfs: remove pgio_header refcount, related cleanup" - added "nfs: remove unneeded EXPORTs" - applied "Reviewed-by" to reviewed patches Weston Andros Adamson (7): nfs: move nfs_pgio_data and remove nfs_rw_header nfs: rename members of nfs_pgio_data nfs: merge nfs_pgio_data into _header nfs: remove unused writeverf code nfs: remove pgio_header refcount, related cleanup pnfs: clean up *_resend_to_mds nfs: remove unneeded EXPORTs fs/nfs/blocklayout/blocklayout.c | 99 ++++++++-------- fs/nfs/direct.c | 33 ++---- fs/nfs/filelayout/filelayout.c | 180 +++++++++++++--------------- fs/nfs/internal.h | 11 +- fs/nfs/nfs3proc.c | 21 ++-- fs/nfs/nfs4_fs.h | 6 +- fs/nfs/nfs4proc.c | 105 +++++++++-------- fs/nfs/nfs4trace.h | 28 ++--- fs/nfs/objlayout/objio_osd.c | 24 ++-- fs/nfs/objlayout/objlayout.c | 81 ++++++------- fs/nfs/objlayout/objlayout.h | 8 +- fs/nfs/pagelist.c | 248 ++++++++++++++++++--------------------- fs/nfs/pnfs.c | 161 +++++++------------------ fs/nfs/pnfs.h | 18 ++- fs/nfs/proc.c | 27 +++-- fs/nfs/read.c | 48 ++++---- fs/nfs/write.c | 80 ++++++------- include/linux/nfs_page.h | 15 ++- include/linux/nfs_xdr.h | 33 ++---- 19 files changed, 544 insertions(+), 682 deletions(-) -- 1.8.5.2 (Apple Git-48) -- 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