Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 535918f1 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Further cleanups for nfs4_open_revalidate() 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b8d4cadd

fs/nfs/dir.c

+26 −6
Original line number Original line Diff line number Diff line
@@ -1204,16 +1204,36 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd) 
	 * operations that change the directory. We therefore save the

	 * operations that change the directory. We therefore save the

	 * change attribute *before* we do the RPC call.

	 * change attribute *before* we do the RPC call.

	 */

	 */

	ret = nfs4_open_revalidate(dir, ctx, openflags);

	inode = nfs4_atomic_open(dir, ctx, openflags, NULL);

	if (ret == 1)

	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);

		nfs_intent_set_file(nd, ctx);

	else

	} else

		put_nfs_open_context(ctx);

		goto out_drop;

out:

out:

	dput(parent);

	dput(parent);

	if (!ret)

		d_drop(dentry);

	return ret;

	return ret;

out_drop:

	d_drop(dentry);

	ret = 0;

out_put_ctx:

	put_nfs_open_context(ctx);

	goto out;



no_open_dput:

no_open_dput:

	dput(parent);

	dput(parent);

no_open:

no_open:

fs/nfs/nfs4_fs.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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 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 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 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_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle);

extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,

extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,

		struct nfs4_fs_locations *fs_locations, struct page *page);

		struct nfs4_fs_locations *fs_locations, struct page *page);

fs/nfs/nfs4proc.c

+0 −28
Original line number Original line Diff line number Diff line
@@ -2037,34 +2037,6 @@ nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags 
	return igrab(state->inode);

	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)

static void nfs4_close_context(struct nfs_open_context *ctx, int is_sync)

{

{

	if (ctx->state == NULL)

	if (ctx->state == NULL)