diff options
| author | Trond Myklebust | 2011-07-13 21:58:28 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2011-07-15 15:12:21 +0200 |
| commit | 493292ddc78d18ee2ad2d5c24c2b7dd6a24641d2 (patch) | |
| tree | cad42b32b7baa303189ddd6d791229c619f24f37 /fs/nfs/pnfs.h | |
| parent | NFS: Allow the nfs_pageio_descriptor to signal that a re-coalesce is needed (diff) | |
| download | kernel-qcow2-linux-493292ddc78d18ee2ad2d5c24c2b7dd6a24641d2.tar.gz kernel-qcow2-linux-493292ddc78d18ee2ad2d5c24c2b7dd6a24641d2.tar.xz kernel-qcow2-linux-493292ddc78d18ee2ad2d5c24c2b7dd6a24641d2.zip | |
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/pnfs.h')
| -rw-r--r-- | fs/nfs/pnfs.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index a59736eae6ec..c40ffa52c1ab 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -157,9 +157,8 @@ void set_pnfs_layoutdriver(struct nfs_server *, u32 id); void unset_pnfs_layoutdriver(struct nfs_server *); enum pnfs_try_status pnfs_try_to_write_data(struct nfs_write_data *, const struct rpc_call_ops *, int); -enum pnfs_try_status pnfs_try_to_read_data(struct nfs_read_data *, - const struct rpc_call_ops *); void pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *, struct nfs_page *); +int pnfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc); void pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *, struct nfs_page *); bool pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, struct nfs_page *req); int pnfs_layout_process(struct nfs4_layoutget *lgp); @@ -330,13 +329,6 @@ static inline void put_lseg(struct pnfs_layout_segment *lseg) } static inline enum pnfs_try_status -pnfs_try_to_read_data(struct nfs_read_data *data, - const struct rpc_call_ops *call_ops) -{ - return PNFS_NOT_ATTEMPTED; -} - -static inline enum pnfs_try_status pnfs_try_to_write_data(struct nfs_write_data *data, const struct rpc_call_ops *call_ops, int how) { |