From: Andy Adamson <andros@xxxxxxxxxx>
squash into pnfs_submit-layout-helper-functions
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/pnfs.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index f838f2d..f094925 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -530,7 +530,7 @@ send_layoutget(struct inode *ino,
{
int status;
struct nfs_server *server = NFS_SERVER(ino);
- struct nfs4_pnfs_layoutget *lgp;
+ struct nfs4_layoutget *lgp;
dprintk("--> %s\n", __func__);
@@ -564,7 +564,7 @@ send_layoutget(struct inode *ino,
}
/* Retrieve layout information from server */
- status = pnfs4_proc_layoutget(lgp);
+ status = nfs4_proc_layoutget(lgp);
dprintk("<-- %s status %d\n", __func__, status);
return status;
@@ -1121,7 +1121,7 @@ int
pnfs_layout_process(struct nfs4_layoutget *lgp)
{
struct pnfs_layout_hdr *lo = NFS_I(lgp->args.inode)->layout;
- struct nfs4_pnfs_layoutget_res *res = &lgp->res;
+ struct nfs4_layoutget_res *res = &lgp->res;
struct pnfs_layout_segment *lseg;
struct inode *ino = PNFS_INODE(lo);
int status = 0;
--
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
