diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-22 18:40:12 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:43:44 -0400 |
commit | 3d4ff43d895c50319af45eb4bf04a4618eccdf76 (patch) | |
tree | b412cd076920a903a854a20bceed4a0ce511fd13 /fs/nfs/nfs4proc.c | |
parent | 82a2c1b77ada3b81911deeb871719ec5ff77f83c (diff) |
nfs_open_context doesn't need struct path either
just dentry, please...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index aef22fa0a1c0..26bece8f3083 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -1132,7 +1132,7 @@ static struct nfs4_opendata *nfs4_open_recoverdata_alloc(struct nfs_open_context | |||
1132 | { | 1132 | { |
1133 | struct nfs4_opendata *opendata; | 1133 | struct nfs4_opendata *opendata; |
1134 | 1134 | ||
1135 | opendata = nfs4_opendata_alloc(ctx->path.dentry, state->owner, 0, 0, NULL, GFP_NOFS); | 1135 | opendata = nfs4_opendata_alloc(ctx->dentry, state->owner, 0, 0, NULL, GFP_NOFS); |
1136 | if (opendata == NULL) | 1136 | if (opendata == NULL) |
1137 | return ERR_PTR(-ENOMEM); | 1137 | return ERR_PTR(-ENOMEM); |
1138 | opendata->state = state; | 1138 | opendata->state = state; |
@@ -1650,7 +1650,7 @@ static int _nfs4_open_expired(struct nfs_open_context *ctx, struct nfs4_state *s | |||
1650 | return PTR_ERR(opendata); | 1650 | return PTR_ERR(opendata); |
1651 | ret = nfs4_open_recover(opendata, state); | 1651 | ret = nfs4_open_recover(opendata, state); |
1652 | if (ret == -ESTALE) | 1652 | if (ret == -ESTALE) |
1653 | d_drop(ctx->path.dentry); | 1653 | d_drop(ctx->dentry); |
1654 | nfs4_opendata_put(opendata); | 1654 | nfs4_opendata_put(opendata); |
1655 | return ret; | 1655 | return ret; |
1656 | } | 1656 | } |
@@ -2081,7 +2081,7 @@ nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags | |||
2081 | struct nfs4_state *state; | 2081 | struct nfs4_state *state; |
2082 | 2082 | ||
2083 | /* Protect against concurrent sillydeletes */ | 2083 | /* Protect against concurrent sillydeletes */ |
2084 | state = nfs4_do_open(dir, ctx->path.dentry, ctx->mode, open_flags, attr, ctx->cred); | 2084 | state = nfs4_do_open(dir, ctx->dentry, ctx->mode, open_flags, attr, ctx->cred); |
2085 | if (IS_ERR(state)) | 2085 | if (IS_ERR(state)) |
2086 | return ERR_CAST(state); | 2086 | return ERR_CAST(state); |
2087 | ctx->state = state; | 2087 | ctx->state = state; |
@@ -2625,7 +2625,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, | |||
2625 | 2625 | ||
2626 | if (ctx != NULL) { | 2626 | if (ctx != NULL) { |
2627 | cred = ctx->cred; | 2627 | cred = ctx->cred; |
2628 | de = ctx->path.dentry; | 2628 | de = ctx->dentry; |
2629 | fmode = ctx->mode; | 2629 | fmode = ctx->mode; |
2630 | } | 2630 | } |
2631 | sattr->ia_mode &= ~current_umask(); | 2631 | sattr->ia_mode &= ~current_umask(); |
@@ -4292,7 +4292,7 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) | |||
4292 | memcpy(data->lsp->ls_stateid.data, data->res.stateid.data, | 4292 | memcpy(data->lsp->ls_stateid.data, data->res.stateid.data, |
4293 | sizeof(data->lsp->ls_stateid.data)); | 4293 | sizeof(data->lsp->ls_stateid.data)); |
4294 | data->lsp->ls_flags |= NFS_LOCK_INITIALIZED; | 4294 | data->lsp->ls_flags |= NFS_LOCK_INITIALIZED; |
4295 | renew_lease(NFS_SERVER(data->ctx->path.dentry->d_inode), data->timestamp); | 4295 | renew_lease(NFS_SERVER(data->ctx->dentry->d_inode), data->timestamp); |
4296 | } | 4296 | } |
4297 | out: | 4297 | out: |
4298 | dprintk("%s: done, ret = %d!\n", __func__, data->rpc_status); | 4298 | dprintk("%s: done, ret = %d!\n", __func__, data->rpc_status); |