NFSv4: Fix the nfs_inode_set_delegation() arguments

Neither nfs_inode_set_delegation() nor nfs_inode_reclaim_delegation() are
generic code. They have no business delving into NFSv4 OPEN xdr structures,
so let's replace the "struct nfs_openres" parameter.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 924238db5983..3eb53d7784e2 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1754,12 +1754,16 @@ nfs4_opendata_check_deleg(struct nfs4_opendata *data, struct nfs4_state *state)
         }
         if ((delegation_flags & 1UL<<NFS_DELEGATION_NEED_RECLAIM) == 0)
                 nfs_inode_set_delegation(state->inode,
-                                         data->owner->so_cred,
-                                         &data->o_res);
+                                data->owner->so_cred,
+                                data->o_res.delegation_type,
+                                &data->o_res.delegation,
+                                data->o_res.pagemod_limit);
         else
                 nfs_inode_reclaim_delegation(state->inode,
-                                             data->owner->so_cred,
-                                             &data->o_res);
+                                data->owner->so_cred,
+                                data->o_res.delegation_type,
+                                &data->o_res.delegation,
+                                data->o_res.pagemod_limit);
 }
 
 /*