Linux-NFS Archive on lore.kernel.org
 help / color / Atom feed
From: "Benjamin Coddington" <bcodding@redhat.com>
To: "Trond Myklebust" <trondmy@gmail.com>,
	"Anna Schumaker" <Anna.Schumaker@netapp.com>
Cc: "Al Viro" <viro@zeniv.linux.org.uk>, linux-nfs@vger.kernel.org
Subject: Re: [PATCH 2/3] NFSv3: use nfs_add_or_obtain() to create and reference inodes
Date: Fri, 13 Sep 2019 09:02:21 -0400
Message-ID: <ED577122-CC95-4A39-9376-CC0DC4D73EC6@redhat.com> (raw)
In-Reply-To: <157982bc982443f8c675d4269e70da55afa82821.1568377101.git.bcodding@redhat.com>

On 13 Sep 2019, at 8:29, Benjamin Coddington wrote:

mm.. not sure what happened to the body here.. maybe I didn't have one.
Should at least have:

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>

> ---
>  fs/nfs/nfs3proc.c | 45 ++++++++++++++++++++++++++++++++++++---------
>  1 file changed, 36 insertions(+), 9 deletions(-)
>
> diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
> index a3ad2d46fd42..9eb2f1a503ab 100644
> --- a/fs/nfs/nfs3proc.c
> +++ b/fs/nfs/nfs3proc.c
> @@ -279,15 +279,17 @@ static struct nfs3_createdata 
> *nfs3_alloc_createdata(void)
>  	return data;
>  }
>
> -static int nfs3_do_create(struct inode *dir, struct dentry *dentry, 
> struct nfs3_createdata *data)
> +static struct dentry *
> +nfs3_do_create(struct inode *dir, struct dentry *dentry, struct 
> nfs3_createdata *data)
>  {
>  	int status;
>
>  	status = rpc_call_sync(NFS_CLIENT(dir), &data->msg, 0);
>  	nfs_post_op_update_inode(dir, data->res.dir_attr);
> -	if (status == 0)
> -		status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, 
> NULL);
> -	return status;
> +	if (status != 0)
> +		return ERR_PTR(status);
> +
> +	return nfs_add_or_obtain(dentry, data->res.fh, data->res.fattr, 
> NULL);
>  }
>
>  static void nfs3_free_createdata(struct nfs3_createdata *data)
> @@ -304,6 +306,7 @@ nfs3_proc_create(struct inode *dir, struct dentry 
> *dentry, struct iattr *sattr,
>  {
>  	struct posix_acl *default_acl, *acl;
>  	struct nfs3_createdata *data;
> +	struct dentry *d_alias;
>  	int status = -ENOMEM;
>
>  	dprintk("NFS call  create %pd\n", dentry);
> @@ -330,7 +333,8 @@ nfs3_proc_create(struct inode *dir, struct dentry 
> *dentry, struct iattr *sattr,
>  		goto out;
>
>  	for (;;) {
> -		status = nfs3_do_create(dir, dentry, data);
> +		d_alias = nfs3_do_create(dir, dentry, data);
> +		status = PTR_ERR_OR_ZERO(d_alias);
>
>  		if (status != -ENOTSUPP)
>  			break;
> @@ -355,6 +359,9 @@ nfs3_proc_create(struct inode *dir, struct dentry 
> *dentry, struct iattr *sattr,
>  	if (status != 0)
>  		goto out_release_acls;
>
> +	if (d_alias)
> +		dentry = d_alias;
> +
>  	/* When we created the file with exclusive semantics, make
>  	 * sure we set the attributes afterwards. */
>  	if (data->arg.create.createmode == NFS3_CREATE_EXCLUSIVE) {
> @@ -372,11 +379,13 @@ nfs3_proc_create(struct inode *dir, struct 
> dentry *dentry, struct iattr *sattr,
>  		nfs_post_op_update_inode(d_inode(dentry), data->res.fattr);
>  		dprintk("NFS reply setattr (post-create): %d\n", status);
>  		if (status != 0)
> -			goto out_release_acls;
> +			goto out_dput;
>  	}
>
>  	status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl);
>
> +out_dput:
> +	dput(d_alias);
>  out_release_acls:
>  	posix_acl_release(acl);
>  	posix_acl_release(default_acl);
> @@ -504,6 +513,7 @@ nfs3_proc_symlink(struct inode *dir, struct dentry 
> *dentry, struct page *page,
>  		  unsigned int len, struct iattr *sattr)
>  {
>  	struct nfs3_createdata *data;
> +	struct dentry *d_alias;
>  	int status = -ENOMEM;
>
>  	if (len > NFS3_MAXPATHLEN)
> @@ -522,7 +532,11 @@ nfs3_proc_symlink(struct inode *dir, struct 
> dentry *dentry, struct page *page,
>  	data->arg.symlink.pathlen = len;
>  	data->arg.symlink.sattr = sattr;
>
> -	status = nfs3_do_create(dir, dentry, data);
> +	d_alias = nfs3_do_create(dir, dentry, data);
> +	status = PTR_ERR_OR_ZERO(d_alias);
> +
> +	if (status == 0)
> +		dput(d_alias);
>
>  	nfs3_free_createdata(data);
>  out:
> @@ -535,6 +549,7 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry 
> *dentry, struct iattr *sattr)
>  {
>  	struct posix_acl *default_acl, *acl;
>  	struct nfs3_createdata *data;
> +	struct dentry *d_alias;
>  	int status = -ENOMEM;
>
>  	dprintk("NFS call  mkdir %pd\n", dentry);
> @@ -553,12 +568,18 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry 
> *dentry, struct iattr *sattr)
>  	data->arg.mkdir.len = dentry->d_name.len;
>  	data->arg.mkdir.sattr = sattr;
>
> -	status = nfs3_do_create(dir, dentry, data);
> +	d_alias = nfs3_do_create(dir, dentry, data);
> +	status = PTR_ERR_OR_ZERO(d_alias);
> +
>  	if (status != 0)
>  		goto out_release_acls;
>
> +	if (d_alias)
> +		dentry = d_alias;
> +
>  	status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl);
>
> +	dput(d_alias);
>  out_release_acls:
>  	posix_acl_release(acl);
>  	posix_acl_release(default_acl);
> @@ -660,6 +681,7 @@ nfs3_proc_mknod(struct inode *dir, struct dentry 
> *dentry, struct iattr *sattr,
>  {
>  	struct posix_acl *default_acl, *acl;
>  	struct nfs3_createdata *data;
> +	struct dentry *d_alias;
>  	int status = -ENOMEM;
>
>  	dprintk("NFS call  mknod %pd %u:%u\n", dentry,
> @@ -698,12 +720,17 @@ nfs3_proc_mknod(struct inode *dir, struct dentry 
> *dentry, struct iattr *sattr,
>  		goto out;
>  	}
>
> -	status = nfs3_do_create(dir, dentry, data);
> +	d_alias = nfs3_do_create(dir, dentry, data);
> +	status = PTR_ERR_OR_ZERO(d_alias);
>  	if (status != 0)
>  		goto out_release_acls;
>
> +	if (d_alias)
> +		dentry = d_alias;
> +
>  	status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl);
>
> +	dput(d_alias);
>  out_release_acls:
>  	posix_acl_release(acl);
>  	posix_acl_release(default_acl);
> -- 
> 2.20.1

  reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-13 12:29 [PATCH 0/3] nfs_instantiate() might succeed leaving dentry negative unhashed Benjamin Coddington
2019-09-13 12:29 ` [PATCH 1/3] NFS: Refactor nfs_instantiate() for dentry referencing callers Benjamin Coddington
2019-09-13 12:29 ` [PATCH 2/3] NFSv3: use nfs_add_or_obtain() to create and reference inodes Benjamin Coddington
2019-09-13 13:02   ` Benjamin Coddington [this message]
2019-09-13 12:29 ` [PATCH 3/3] NFS: remove unused check for negative dentry Benjamin Coddington

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ED577122-CC95-4A39-9376-CC0DC4D73EC6@redhat.com \
    --to=bcodding@redhat.com \
    --cc=Anna.Schumaker@netapp.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trondmy@gmail.com \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-NFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \
		linux-nfs@vger.kernel.org linux-nfs@archiver.kernel.org
	public-inbox-index linux-nfs


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs


AGPL code for this site: git clone https://public-inbox.org/ public-inbox