v2: - rework Tigran's patch to preserve existing selection behaviour - simplify layout driver selection by sorting the list This is v2 of the patchset. Most of the changes are to incorporate Bruce's suggestions on the client code. Original cover letter follows: Only lightly tested by mounting a server that sends both flexfiles and block layouts. The client successfully selected the block layout in most cases, but if I blacklist blocklayoutdriver then it selects flexfiles instead. I'm sending these together, but I'd expect Bruce to pick up the nfsd patches and Trond or Anna to pick up the client-side ones. The nfsd patch is based on top of Tom's nfsd flexfile layout patches. Jeff Layton (3): nfsd: allow nfsd to advertise multiple layout types pnfs: track multiple layout types in fsinfo structure pnfs: add a new mechanism to select a layout driver according to an ordered list fs/nfs/client.c | 2 +- fs/nfs/nfs4xdr.c | 23 +++++++--------- fs/nfs/pnfs.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- fs/nfs/pnfs.h | 4 +-- fs/nfsd/export.c | 4 +-- fs/nfsd/export.h | 2 +- fs/nfsd/nfs4layouts.c | 6 ++--- fs/nfsd/nfs4proc.c | 4 +-- fs/nfsd/nfs4xdr.c | 30 ++++++++++----------- include/linux/nfs_xdr.h | 7 ++++- 10 files changed, 101 insertions(+), 53 deletions(-) -- 2.5.5 -- 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