From: "J. Bruce Fields" <bfields@fieldses.org>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, hch@infradead.org
Subject: Re: [patch] nfsd: clean up mnt_want_write calls
Date: Tue, 1 Jul 2008 15:24:29 -0400 [thread overview]
Message-ID: <20080701192429.GE23080@fieldses.org> (raw)
In-Reply-To: <E1KDg43-0005HY-QR@pomaz-ex.szeredi.hu>
On Tue, Jul 01, 2008 at 03:38:35PM +0200, Miklos Szeredi wrote:
> From: Miklos Szeredi <mszeredi@suse.cz>
>
> Multiple mnt_want_write() calls in the switch statement looks really
> ugly.
Looks right to me; applied for 2.6.27; thanks, Miklos!
--b.
>
> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
> Acked-by: Christoph Hellwig <hch@infradead.org>
> ---
> fs/nfsd/vfs.c | 25 +++++++++++--------------
> 1 file changed, 11 insertions(+), 14 deletions(-)
>
> Index: linux-2.6/fs/nfsd/vfs.c
> ===================================================================
> --- linux-2.6.orig/fs/nfsd/vfs.c 2008-06-13 13:26:49.000000000 +0200
> +++ linux-2.6/fs/nfsd/vfs.c 2008-06-13 13:26:52.000000000 +0200
> @@ -1248,36 +1248,34 @@ nfsd_create(struct svc_rqst *rqstp, stru
> iap->ia_mode = 0;
> iap->ia_mode = (iap->ia_mode & S_IALLUGO) | type;
>
> + err = nfserr_inval;
> + if (!S_ISREG(type) && !S_ISDIR(type) && !special_file(type)) {
> + printk(KERN_WARNING "nfsd: bad file type %o in nfsd_create\n",
> + type);
> + goto out;
> + }
> +
> + host_err = mnt_want_write(fhp->fh_export->ex_path.mnt);
> + if (host_err)
> + goto out_nfserr;
> +
> /*
> * Get the dir op function pointer.
> */
> err = 0;
> switch (type) {
> case S_IFREG:
> - host_err = mnt_want_write(fhp->fh_export->ex_path.mnt);
> - if (host_err)
> - goto out_nfserr;
> host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
> break;
> case S_IFDIR:
> - host_err = mnt_want_write(fhp->fh_export->ex_path.mnt);
> - if (host_err)
> - goto out_nfserr;
> host_err = vfs_mkdir(dirp, dchild, iap->ia_mode);
> break;
> case S_IFCHR:
> case S_IFBLK:
> case S_IFIFO:
> case S_IFSOCK:
> - host_err = mnt_want_write(fhp->fh_export->ex_path.mnt);
> - if (host_err)
> - goto out_nfserr;
> host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev);
> break;
> - default:
> - printk("nfsd: bad file type %o in nfsd_create\n", type);
> - host_err = -EINVAL;
> - goto out_nfserr;
> }
> if (host_err < 0) {
> mnt_drop_write(fhp->fh_export->ex_path.mnt);
> @@ -1289,7 +1287,6 @@ nfsd_create(struct svc_rqst *rqstp, stru
> write_inode_now(dchild->d_inode, 1);
> }
>
> -
> err2 = nfsd_create_setattr(rqstp, resfhp, iap);
> if (err2)
> err = err2;
prev parent reply other threads:[~2008-07-01 19:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-01 13:38 [patch] nfsd: clean up mnt_want_write calls Miklos Szeredi
2008-07-01 19:24 ` J. Bruce Fields [this message]
Reply instructions:
You may reply publicly 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=20080701192429.GE23080@fieldses.org \
--to=bfields@fieldses.org \
--cc=akpm@linux-foundation.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miklos@szeredi.hu \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).