From: Linus Torvalds Date: Sun, 29 May 2011 21:10:13 +0000 (-0700) Subject: Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd X-Git-Tag: v3.0-rc1~2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cd1acdf1723d71b28175f95b04305f1cc74ce363;p=~emulex%2Finfiniband.git Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd * 'pnfs-submit' of git://git.open-osd.org/linux-open-osd: (32 commits) pnfs-obj: pg_test check for max_io_size NFSv4.1: define nfs_generic_pg_test NFSv4.1: use pnfs_generic_pg_test directly by layout driver NFSv4.1: change pg_test return type to bool NFSv4.1: unify pnfs_pageio_init functions pnfs-obj: objlayout_encode_layoutcommit implementation pnfs: encode_layoutcommit pnfs-obj: report errors and .encode_layoutreturn Implementation. pnfs: encode_layoutreturn pnfs: layoutret_on_setattr pnfs: layoutreturn pnfs-obj: osd raid engine read/write implementation pnfs: support for non-rpc layout drivers pnfs-obj: define per-inode private structure pnfs: alloc and free layout_hdr layoutdriver methods pnfs-obj: objio_osd device information retrieval and caching pnfs-obj: decode layout, alloc/free lseg pnfs-obj: pnfs_osd XDR client implementation pnfs-obj: pnfs_osd XDR definitions pnfs-obj: objlayoutdriver module skeleton ... --- cd1acdf1723d71b28175f95b04305f1cc74ce363