diff options
author | Fred Isaman <iisaman@netapp.com> | 2012-04-20 14:47:46 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-27 14:10:37 -0400 |
commit | 4db6e0b74c0f6dfc2f9c0690e8df512e3b635983 (patch) | |
tree | 19d8a2a7051bdab220b0bdcf3da1e350a53ce428 /include/linux/nfs_page.h | |
parent | 30dd374f6fc1b202db3a1b57b61afff1326bad92 (diff) |
NFS: merge _full and _partial read rpc_ops
Decouple nfs_pgio_header and nfs_read_data, and have (possibly
multiple) nfs_read_datas each take a refcount on nfs_pgio_header.
For the moment keeps nfs_read_header as a way to preallocate a single
nfs_read_data with the nfs_pgio_header. The code doesn't need this,
and would be prettier without, but given the amount of churn I am
already introducing I didn't want to play with tuning new mempools.
This also fixes bug in pnfs_ld_handle_read_error. In the case of
desc->pg_bsize < PAGE_CACHE_SIZE, the pages list was empty, causing
replay attempt to do nothing.
Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/nfs_page.h')
-rw-r--r-- | include/linux/nfs_page.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index eac30d6bec17..5c520344d8ad 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h | |||
@@ -27,7 +27,6 @@ enum { | |||
27 | PG_CLEAN, | 27 | PG_CLEAN, |
28 | PG_NEED_COMMIT, | 28 | PG_NEED_COMMIT, |
29 | PG_NEED_RESCHED, | 29 | PG_NEED_RESCHED, |
30 | PG_PARTIAL_READ_FAILED, | ||
31 | PG_COMMIT_TO_DS, | 30 | PG_COMMIT_TO_DS, |
32 | }; | 31 | }; |
33 | 32 | ||