diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-13 15:58:28 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-15 09:12:21 -0400 |
commit | 493292ddc78d18ee2ad2d5c24c2b7dd6a24641d2 (patch) | |
tree | cad42b32b7baa303189ddd6d791229c619f24f37 /fs/nfs/objlayout/objio_osd.c | |
parent | d9156f9f364897e93bdd98b4ad22138de18f7c24 (diff) | |
download | op-kernel-dev-493292ddc78d18ee2ad2d5c24c2b7dd6a24641d2.zip op-kernel-dev-493292ddc78d18ee2ad2d5c24c2b7dd6a24641d2.tar.gz |
NFS: Move the pnfs read code into pnfs.c
...and ensure that we recoalese to take into account differences in
block sizes when falling back to read through the MDS.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/objlayout/objio_osd.c')
-rw-r--r-- | fs/nfs/objlayout/objio_osd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c index 70272d5..add6289 100644 --- a/fs/nfs/objlayout/objio_osd.c +++ b/fs/nfs/objlayout/objio_osd.c @@ -1007,7 +1007,7 @@ static bool objio_pg_test(struct nfs_pageio_descriptor *pgio, static const struct nfs_pageio_ops objio_pg_read_ops = { .pg_init = pnfs_generic_pg_init_read, .pg_test = objio_pg_test, - .pg_doio = nfs_generic_pg_readpages, + .pg_doio = pnfs_generic_pg_readpages, }; static const struct nfs_pageio_ops objio_pg_write_ops = { |