3 files changed, 21 insertions, 21 deletions

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index b47c156a711d..9f17b91205cf 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -74,7 +74,7 @@ again:
                         continue;
                 get_nfs_open_context(ctx);
                 spin_unlock(&inode->i_lock);
-                err = nfs4_open_delegation_recall(ctx->path.dentry, state);
+                err = nfs4_open_delegation_recall(ctx, state);
                 if (err >= 0)
                         err = nfs_delegation_claim_locks(ctx, state);
                 put_nfs_open_context(ctx);
diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h
index 2cfd4b24c7fe..f6e42fb21afb 100644
--- a/fs/nfs/delegation.h
+++ b/fs/nfs/delegation.h
@@ -39,7 +39,7 @@ void nfs_delegation_reap_unclaimed(struct nfs_client *clp);
 
 /* NFSv4 delegation-related procedures */
 int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid);
-int nfs4_open_delegation_recall(struct dentry *dentry, struct nfs4_state *state);
+int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state);
 int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl);
 int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode);
 
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4d641cbdbde1..c83db9def0fe 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -462,7 +462,7 @@ static int nfs4_open_recover(struct nfs4_opendata *opendata, struct nfs4_state *
  * OPEN_RECLAIM:
  *      reclaim state on the server after a reboot.
  */
-static int _nfs4_do_open_reclaim(struct nfs4_state_owner *sp, struct nfs4_state *state, struct dentry *dentry)
+static int _nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
 {
         struct nfs_delegation *delegation = NFS_I(state->inode)->delegation;
         struct nfs4_opendata *opendata;
@@ -478,7 +478,7 @@ static int _nfs4_do_open_reclaim(struct nfs4_state_owner *sp, struct nfs4_state
                 }
                 delegation_type = delegation->type;
         }
-        opendata = nfs4_opendata_alloc(dentry, sp, 0, NULL);
+        opendata = nfs4_opendata_alloc(ctx->path.dentry, state->owner, 0, NULL);
         if (opendata == NULL)
                 return -ENOMEM;
         opendata->o_arg.claim = NFS4_OPEN_CLAIM_PREVIOUS;
@@ -490,13 +490,13 @@ static int _nfs4_do_open_reclaim(struct nfs4_state_owner *sp, struct nfs4_state
         return status;
 }
 
-static int nfs4_do_open_reclaim(struct nfs4_state_owner *sp, struct nfs4_state *state, struct dentry *dentry)
+static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
 {
         struct nfs_server *server = NFS_SERVER(state->inode);
         struct nfs4_exception exception = { };
         int err;
         do {
-                err = _nfs4_do_open_reclaim(sp, state, dentry);
+                err = _nfs4_do_open_reclaim(ctx, state);
                 if (err != -NFS4ERR_DELAY)
                         break;
                 nfs4_handle_exception(server, err, &exception);
@@ -512,12 +512,12 @@ static int nfs4_open_reclaim(struct nfs4_state_owner *sp, struct nfs4_state *sta
         ctx = nfs4_state_find_open_context(state);
         if (IS_ERR(ctx))
                 return PTR_ERR(ctx);
-        ret = nfs4_do_open_reclaim(sp, state, ctx->path.dentry);
+        ret = nfs4_do_open_reclaim(ctx, state);
         put_nfs_open_context(ctx);
         return ret;
 }
 
-static int _nfs4_open_delegation_recall(struct dentry *dentry, struct nfs4_state *state)
+static int _nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state)
 {
         struct nfs4_state_owner  *sp  = state->owner;
         struct nfs4_opendata *opendata;
@@ -525,7 +525,7 @@ static int _nfs4_open_delegation_recall(struct dentry *dentry, struct nfs4_state
 
         if (!test_bit(NFS_DELEGATED_STATE, &state->flags))
                 return 0;
-        opendata = nfs4_opendata_alloc(dentry, sp, 0, NULL);
+        opendata = nfs4_opendata_alloc(ctx->path.dentry, sp, 0, NULL);
         if (opendata == NULL)
                 return -ENOMEM;
         opendata->o_arg.claim = NFS4_OPEN_CLAIM_DELEGATE_CUR;
@@ -536,13 +536,13 @@ static int _nfs4_open_delegation_recall(struct dentry *dentry, struct nfs4_state
         return ret;
 }
 
-int nfs4_open_delegation_recall(struct dentry *dentry, struct nfs4_state *state)
+int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state)
 {
         struct nfs4_exception exception = { };
-        struct nfs_server *server = NFS_SERVER(dentry->d_inode);
+        struct nfs_server *server = NFS_SERVER(state->inode);
         int err;
         do {
-                err = _nfs4_open_delegation_recall(dentry, state);
+                err = _nfs4_open_delegation_recall(ctx, state);
                 switch (err) {
                         case 0:
                                 return err;
@@ -811,7 +811,7 @@ static int nfs4_recover_expired_lease(struct nfs_server *server)
  *      reclaim state on the server after a network partition.
  *      Assumes caller holds the appropriate lock
  */
-static int _nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *state, struct dentry *dentry)
+static int _nfs4_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
 {
         struct inode *inode = state->inode;
         struct nfs_delegation *delegation = NFS_I(inode)->delegation;
@@ -820,34 +820,34 @@ static int _nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st
         int ret;
 
         if (delegation != NULL && !(delegation->flags & NFS_DELEGATION_NEED_RECLAIM)) {
-                ret = _nfs4_do_access(inode, sp->so_cred, openflags);
+                ret = _nfs4_do_access(inode, ctx->cred, openflags);
                 if (ret < 0)
                         return ret;
                 memcpy(&state->stateid, &delegation->stateid, sizeof(state->stateid));
                 set_bit(NFS_DELEGATED_STATE, &state->flags);
                 return 0;
         }
-        opendata = nfs4_opendata_alloc(dentry, sp, openflags, NULL);
+        opendata = nfs4_opendata_alloc(ctx->path.dentry, state->owner, openflags, NULL);
         if (opendata == NULL)
                 return -ENOMEM;
         ret = nfs4_open_recover(opendata, state);
         if (ret == -ESTALE) {
                 /* Invalidate the state owner so we don't ever use it again */
-                nfs4_drop_state_owner(sp);
-                d_drop(dentry);
+                nfs4_drop_state_owner(state->owner);
+                d_drop(ctx->path.dentry);
         }
         nfs4_opendata_free(opendata);
         return ret;
 }
 
-static inline int nfs4_do_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *state, struct dentry *dentry)
+static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
 {
-        struct nfs_server *server = NFS_SERVER(dentry->d_inode);
+        struct nfs_server *server = NFS_SERVER(state->inode);
         struct nfs4_exception exception = { };
         int err;
 
         do {
-                err = _nfs4_open_expired(sp, state, dentry);
+                err = _nfs4_open_expired(ctx, state);
                 if (err == -NFS4ERR_DELAY)
                         nfs4_handle_exception(server, err, &exception);
         } while (exception.retry);
@@ -862,7 +862,7 @@ static int nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *sta
         ctx = nfs4_state_find_open_context(state);
         if (IS_ERR(ctx))
                 return PTR_ERR(ctx);
-        ret = nfs4_do_open_expired(sp, state, ctx->path.dentry);
+        ret = nfs4_do_open_expired(ctx, state);
         put_nfs_open_context(ctx);
         return ret;
 }