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

Commit 275bb307 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Move dentry instantiation into the NFSv4-specific atomic open code 



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

fs/nfs/dir.c

+3 −16
Original line number Diff line number Diff line
@@ -1357,11 +1357,6 @@ static int nfs_finish_open(struct nfs_open_context *ctx, 
{

	int err;



	if (ctx->dentry != dentry) {

		dput(ctx->dentry);

		ctx->dentry = dget(dentry);

	}



	err = finish_open(file, dentry, do_open, opened);

	if (err)

		goto out;
@@ -1420,13 +1415,13 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry, 


	nfs_block_sillyrename(dentry->d_parent);

	inode = NFS_PROTO(dir)->open_context(dir, ctx, open_flags, &attr);

	d_drop(dentry);

	if (IS_ERR(inode)) {

	nfs_unblock_sillyrename(dentry->d_parent);

	if (IS_ERR(inode)) {

		put_nfs_open_context(ctx);

		err = PTR_ERR(inode);

		switch (err) {

		case -ENOENT:

			d_drop(dentry);

			d_add(dentry, NULL);

			break;

		case -EISDIR:
@@ -1442,16 +1437,8 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry, 
		}

		goto out;

	}

	res = d_add_unique(dentry, inode);

	if (res != NULL)

		dentry = res;



	nfs_unblock_sillyrename(dentry->d_parent);

	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));



	err = nfs_finish_open(ctx, dentry, file, open_flags, opened);



	dput(res);

	err = nfs_finish_open(ctx, ctx->dentry, file, open_flags, opened);

out:

	return err;

fs/nfs/nfs4file.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ nfs4_file_open(struct inode *inode, struct file *filp) 
			goto out_drop;

		}

	}

	iput(inode);

	if (inode != dentry->d_inode)

		goto out_drop;

fs/nfs/nfs4proc.c

+17 −4
Original line number Diff line number Diff line
@@ -1964,6 +1964,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, 
{

	struct nfs4_state_owner *sp = opendata->owner;

	struct nfs_server *server = sp->so_server;

	struct dentry *dentry;

	struct nfs4_state *state;

	unsigned int seq;

	int ret;
@@ -1981,6 +1982,21 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, 
	if (server->caps & NFS_CAP_POSIX_LOCK)

		set_bit(NFS_STATE_POSIX_LOCKS, &state->flags);



	dentry = opendata->dentry;

	if (dentry->d_inode == NULL) {

		/* FIXME: Is this d_drop() ever needed? */

		d_drop(dentry);

		dentry = d_add_unique(dentry, igrab(state->inode));

		if (dentry == NULL) {

			dentry = opendata->dentry;

		} else if (dentry != ctx->dentry) {

			dput(ctx->dentry);

			ctx->dentry = dget(dentry);

		}

		nfs_set_verifier(dentry,

				nfs_save_change_attribute(opendata->dir->d_inode));

	}



	ret = nfs4_opendata_access(sp->so_cred, opendata, state, fmode, flags);

	if (ret != 0)

		goto out;
@@ -2444,7 +2460,7 @@ nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags 
	state = nfs4_do_open(dir, ctx, open_flags, attr);

	if (IS_ERR(state))

		return ERR_CAST(state);

	return igrab(state->inode);

	return state->inode;

}



static void nfs4_close_context(struct nfs_open_context *ctx, int is_sync)
@@ -3050,13 +3066,10 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, 


	sattr->ia_mode &= ~current_umask();

	state = nfs4_do_open(dir, ctx, flags, sattr);

	d_drop(dentry);

	if (IS_ERR(state)) {

		status = PTR_ERR(state);

		goto out;

	}

	d_add(dentry, igrab(state->inode));

	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));

out:

	put_nfs_open_context(ctx);

	return status;