From: Andy Adamson <andros@xxxxxxxxxx>
squash into pnfs_submit-wave3-generic-read
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/pnfs.h | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 218cdfe..b47598c 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -76,15 +76,11 @@ struct pnfs_layoutdriver_type {
/* test for nfs page cache coalescing */
int (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);
- /* read and write pagelist should return just 0 (to indicate that
- * the layout code has taken control) or 1 (to indicate that the
- * layout code wishes to fall back to normal nfs.) If 0 is returned,
- * information can be passed back through nfs_data->res and
- * nfs_data->task.tk_status, and the appropriate pnfs done function
- * MUST be called.
+ /*
+ * Return PNFS_ATTEMPTED to indicate the layout code has attempted
+ * I/O, else return PNFS_NOT_ATTEMPTED to fall back to normal NFS
*/
- enum pnfs_try_status
- (*read_pagelist) (struct nfs_read_data *nfs_data);
+ enum pnfs_try_status (*read_pagelist) (struct nfs_read_data *nfs_data);
};
struct pnfs_layout_hdr {
--
1.6.6
--
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
