From: Andy Adamson <andros@xxxxxxxxxx>
squash into pnfs_submit-pageio-helpers
Signed-of-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/pnfs.c | 6 +++---
include/linux/nfs4_pnfs.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index b9bf9d6..52d1a79 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1163,14 +1163,14 @@ out:
void
pnfs_set_pg_test(struct inode *inode, struct nfs_pageio_descriptor *pgio)
{
- struct pnfs_layout_type *laytype;
+ struct pnfs_layout_hdr *lo;
struct pnfs_layoutdriver_type *ld;
pgio->pg_test = NULL;
- laytype = NFS_I(inode)->layout;
+ lo = NFS_I(inode)->layout;
ld = NFS_SERVER(inode)->pnfs_curr_ld;
- if (!pnfs_enabled_sb(NFS_SERVER(inode)) || !laytype)
+ if (!pnfs_enabled_sb(NFS_SERVER(inode)) || !lo)
return;
if (ld->ld_policy_ops)
diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h
index 89d0e7e..cbb98f1 100644
--- a/include/linux/nfs4_pnfs.h
+++ b/include/linux/nfs4_pnfs.h
@@ -148,7 +148,7 @@ struct layoutdriver_io_operations {
struct layoutdriver_policy_operations {
/* The stripe size of the file system */
- ssize_t (*get_stripesize) (struct pnfs_layout_type *layoutid);
+ ssize_t (*get_stripesize) (struct pnfs_layout_hdr *layoutid);
/* test for nfs page cache coalescing */
int (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);
--
1.6.2.5
--
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
