diff options
| -rw-r--r-- | fs/nfs/dir.c | 32 | ||||
| -rw-r--r-- | fs/nfs/nfs4_fs.h | 1 | ||||
| -rw-r--r-- | fs/nfs/nfs4proc.c | 28 |
3 files changed, 26 insertions, 35 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 196775c70948..dc93d356341b 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1204,16 +1204,36 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd) * operations that change the directory. We therefore save the * change attribute *before* we do the RPC call. */ - ret = nfs4_open_revalidate(dir, ctx, openflags); - if (ret == 1) + inode = nfs4_atomic_open(dir, ctx, openflags, NULL); + if (IS_ERR(inode)) { + ret = PTR_ERR(inode); + switch (ret) { + case -EPERM: + case -EACCES: + case -EDQUOT: + case -ENOSPC: + case -EROFS: + goto out_put_ctx; + default: + goto out_drop; + } + } + iput(inode); + if (inode == dentry->d_inode) { + nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); nfs_intent_set_file(nd, ctx); - else - put_nfs_open_context(ctx); + } else + goto out_drop; out: dput(parent); - if (!ret) - d_drop(dentry); return ret; +out_drop: + d_drop(dentry); + ret = 0; +out_put_ctx: + put_nfs_open_context(ctx); + goto out; + no_open_dput: dput(parent); no_open: diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 76ec1c6d92ac..6cf12ba9f4e7 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -243,7 +243,6 @@ extern int nfs4_init_clientid(struct nfs_client *, struct rpc_cred *); extern int nfs41_init_clientid(struct nfs_client *, struct rpc_cred *); extern int nfs4_do_close(struct path *path, struct nfs4_state *state, gfp_t gfp_mask, int wait); extern struct inode *nfs4_atomic_open(struct inode *, struct nfs_open_context *, int, struct iattr *); -extern int nfs4_open_revalidate(struct inode *, struct nfs_open_context *, int); extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle); extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name, struct nfs4_fs_locations *fs_locations, struct page *page); diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index b4762463b19f..83c5ef6e7cef 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2037,34 +2037,6 @@ nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags return igrab(state->inode); } -int -nfs4_open_revalidate(struct inode *dir, struct nfs_open_context *ctx, int openflags) -{ - struct nfs4_state *state; - - state = nfs4_do_open(dir, &ctx->path, ctx->mode, openflags, NULL, ctx->cred); - if (IS_ERR(state)) { - switch (PTR_ERR(state)) { - case -EPERM: - case -EACCES: - case -EDQUOT: - case -ENOSPC: - case -EROFS: - return PTR_ERR(state); - default: - goto out_drop; - } - } - ctx->state = state; - if (state->inode == ctx->path.dentry->d_inode) { - nfs_set_verifier(ctx->path.dentry, nfs_save_change_attribute(dir)); - return 1; - } -out_drop: - d_drop(ctx->path.dentry); - return 0; -} - static void nfs4_close_context(struct nfs_open_context *ctx, int is_sync) { if (ctx->state == NULL) |