From: Andy Adamson <andros@xxxxxxxxxx>
squash into pnfs_submit: cb_layoutrecall
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/callback_proc.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index e2ea2be..638f074 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -120,7 +120,7 @@ int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation, const nf
#if defined(CONFIG_NFS_V4_1)
static bool
-pnfs_is_next_layout_stateid(const struct pnfs_layout_type *lo,
+pnfs_is_next_layout_stateid(const struct pnfs_layout_hdr *lo,
const nfs4_stateid stateid)
{
int seqlock;
@@ -161,7 +161,7 @@ nfs_layoutrecall_find_inode(struct nfs_client *clp,
const struct cb_pnfs_layoutrecallargs *args)
{
struct nfs_inode *nfsi;
- struct pnfs_layout_type *layout;
+ struct pnfs_layout_hdr *lo;
struct nfs_server *server;
struct inode *ino = NULL;
@@ -169,8 +169,8 @@ nfs_layoutrecall_find_inode(struct nfs_client *clp,
__func__, args->cbl_recall_type, clp);
spin_lock(&clp->cl_lock);
- list_for_each_entry(layout, &clp->cl_layouts, lo_layouts) {
- nfsi = PNFS_NFS_INODE(layout);
+ list_for_each_entry(lo, &clp->cl_layouts, lo_layouts) {
+ nfsi = PNFS_NFS_INODE(lo);
if (!nfsi)
continue;
--
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
