nfs_open_context doesn't need struct path either
just dentry, please... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -1132,7 +1132,7 @@ static struct nfs4_opendata *nfs4_open_recoverdata_alloc(struct nfs_open_context
|
||||
{
|
||||
struct nfs4_opendata *opendata;
|
||||
|
||||
opendata = nfs4_opendata_alloc(ctx->path.dentry, state->owner, 0, 0, NULL, GFP_NOFS);
|
||||
opendata = nfs4_opendata_alloc(ctx->dentry, state->owner, 0, 0, NULL, GFP_NOFS);
|
||||
if (opendata == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
opendata->state = state;
|
||||
@@ -1650,7 +1650,7 @@ static int _nfs4_open_expired(struct nfs_open_context *ctx, struct nfs4_state *s
|
||||
return PTR_ERR(opendata);
|
||||
ret = nfs4_open_recover(opendata, state);
|
||||
if (ret == -ESTALE)
|
||||
d_drop(ctx->path.dentry);
|
||||
d_drop(ctx->dentry);
|
||||
nfs4_opendata_put(opendata);
|
||||
return ret;
|
||||
}
|
||||
@@ -2081,7 +2081,7 @@ nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags
|
||||
struct nfs4_state *state;
|
||||
|
||||
/* Protect against concurrent sillydeletes */
|
||||
state = nfs4_do_open(dir, ctx->path.dentry, ctx->mode, open_flags, attr, ctx->cred);
|
||||
state = nfs4_do_open(dir, ctx->dentry, ctx->mode, open_flags, attr, ctx->cred);
|
||||
if (IS_ERR(state))
|
||||
return ERR_CAST(state);
|
||||
ctx->state = state;
|
||||
@@ -2625,7 +2625,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
|
||||
|
||||
if (ctx != NULL) {
|
||||
cred = ctx->cred;
|
||||
de = ctx->path.dentry;
|
||||
de = ctx->dentry;
|
||||
fmode = ctx->mode;
|
||||
}
|
||||
sattr->ia_mode &= ~current_umask();
|
||||
@@ -4292,7 +4292,7 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata)
|
||||
memcpy(data->lsp->ls_stateid.data, data->res.stateid.data,
|
||||
sizeof(data->lsp->ls_stateid.data));
|
||||
data->lsp->ls_flags |= NFS_LOCK_INITIALIZED;
|
||||
renew_lease(NFS_SERVER(data->ctx->path.dentry->d_inode), data->timestamp);
|
||||
renew_lease(NFS_SERVER(data->ctx->dentry->d_inode), data->timestamp);
|
||||
}
|
||||
out:
|
||||
dprintk("%s: done, ret = %d!\n", __func__, data->rpc_status);
|
||||
|
Reference in New Issue
Block a user