NFSv4: Cleanup: pass the nfs_open_context to open recovery code
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
88be9f990f
commit
539cd03a57
@ -74,7 +74,7 @@ again:
|
|||||||
continue;
|
continue;
|
||||||
get_nfs_open_context(ctx);
|
get_nfs_open_context(ctx);
|
||||||
spin_unlock(&inode->i_lock);
|
spin_unlock(&inode->i_lock);
|
||||||
err = nfs4_open_delegation_recall(ctx->path.dentry, state);
|
err = nfs4_open_delegation_recall(ctx, state);
|
||||||
if (err >= 0)
|
if (err >= 0)
|
||||||
err = nfs_delegation_claim_locks(ctx, state);
|
err = nfs_delegation_claim_locks(ctx, state);
|
||||||
put_nfs_open_context(ctx);
|
put_nfs_open_context(ctx);
|
||||||
|
@ -39,7 +39,7 @@ void nfs_delegation_reap_unclaimed(struct nfs_client *clp);
|
|||||||
|
|
||||||
/* NFSv4 delegation-related procedures */
|
/* NFSv4 delegation-related procedures */
|
||||||
int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid);
|
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_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl);
|
||||||
int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode);
|
int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode);
|
||||||
|
|
||||||
|
@ -462,7 +462,7 @@ static int nfs4_open_recover(struct nfs4_opendata *opendata, struct nfs4_state *
|
|||||||
* OPEN_RECLAIM:
|
* OPEN_RECLAIM:
|
||||||
* reclaim state on the server after a reboot.
|
* 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 nfs_delegation *delegation = NFS_I(state->inode)->delegation;
|
||||||
struct nfs4_opendata *opendata;
|
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;
|
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)
|
if (opendata == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
opendata->o_arg.claim = NFS4_OPEN_CLAIM_PREVIOUS;
|
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;
|
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 nfs_server *server = NFS_SERVER(state->inode);
|
||||||
struct nfs4_exception exception = { };
|
struct nfs4_exception exception = { };
|
||||||
int err;
|
int err;
|
||||||
do {
|
do {
|
||||||
err = _nfs4_do_open_reclaim(sp, state, dentry);
|
err = _nfs4_do_open_reclaim(ctx, state);
|
||||||
if (err != -NFS4ERR_DELAY)
|
if (err != -NFS4ERR_DELAY)
|
||||||
break;
|
break;
|
||||||
nfs4_handle_exception(server, err, &exception);
|
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);
|
ctx = nfs4_state_find_open_context(state);
|
||||||
if (IS_ERR(ctx))
|
if (IS_ERR(ctx))
|
||||||
return PTR_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);
|
put_nfs_open_context(ctx);
|
||||||
return ret;
|
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_state_owner *sp = state->owner;
|
||||||
struct nfs4_opendata *opendata;
|
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))
|
if (!test_bit(NFS_DELEGATED_STATE, &state->flags))
|
||||||
return 0;
|
return 0;
|
||||||
opendata = nfs4_opendata_alloc(dentry, sp, 0, NULL);
|
opendata = nfs4_opendata_alloc(ctx->path.dentry, sp, 0, NULL);
|
||||||
if (opendata == NULL)
|
if (opendata == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
opendata->o_arg.claim = NFS4_OPEN_CLAIM_DELEGATE_CUR;
|
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;
|
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 nfs4_exception exception = { };
|
||||||
struct nfs_server *server = NFS_SERVER(dentry->d_inode);
|
struct nfs_server *server = NFS_SERVER(state->inode);
|
||||||
int err;
|
int err;
|
||||||
do {
|
do {
|
||||||
err = _nfs4_open_delegation_recall(dentry, state);
|
err = _nfs4_open_delegation_recall(ctx, state);
|
||||||
switch (err) {
|
switch (err) {
|
||||||
case 0:
|
case 0:
|
||||||
return err;
|
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.
|
* reclaim state on the server after a network partition.
|
||||||
* Assumes caller holds the appropriate lock
|
* 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 inode *inode = state->inode;
|
||||||
struct nfs_delegation *delegation = NFS_I(inode)->delegation;
|
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;
|
int ret;
|
||||||
|
|
||||||
if (delegation != NULL && !(delegation->flags & NFS_DELEGATION_NEED_RECLAIM)) {
|
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)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
memcpy(&state->stateid, &delegation->stateid, sizeof(state->stateid));
|
memcpy(&state->stateid, &delegation->stateid, sizeof(state->stateid));
|
||||||
set_bit(NFS_DELEGATED_STATE, &state->flags);
|
set_bit(NFS_DELEGATED_STATE, &state->flags);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
opendata = nfs4_opendata_alloc(dentry, sp, openflags, NULL);
|
opendata = nfs4_opendata_alloc(ctx->path.dentry, state->owner, openflags, NULL);
|
||||||
if (opendata == NULL)
|
if (opendata == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
ret = nfs4_open_recover(opendata, state);
|
ret = nfs4_open_recover(opendata, state);
|
||||||
if (ret == -ESTALE) {
|
if (ret == -ESTALE) {
|
||||||
/* Invalidate the state owner so we don't ever use it again */
|
/* Invalidate the state owner so we don't ever use it again */
|
||||||
nfs4_drop_state_owner(sp);
|
nfs4_drop_state_owner(state->owner);
|
||||||
d_drop(dentry);
|
d_drop(ctx->path.dentry);
|
||||||
}
|
}
|
||||||
nfs4_opendata_free(opendata);
|
nfs4_opendata_free(opendata);
|
||||||
return ret;
|
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 = { };
|
struct nfs4_exception exception = { };
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
err = _nfs4_open_expired(sp, state, dentry);
|
err = _nfs4_open_expired(ctx, state);
|
||||||
if (err == -NFS4ERR_DELAY)
|
if (err == -NFS4ERR_DELAY)
|
||||||
nfs4_handle_exception(server, err, &exception);
|
nfs4_handle_exception(server, err, &exception);
|
||||||
} while (exception.retry);
|
} 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);
|
ctx = nfs4_state_find_open_context(state);
|
||||||
if (IS_ERR(ctx))
|
if (IS_ERR(ctx))
|
||||||
return PTR_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);
|
put_nfs_open_context(ctx);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user