2008-07-01 13:39:09

by Miklos Szeredi

Subject: [patch] nfsd: clean up mnt_want_write calls

From: Miklos Szeredi <[email protected]>

Multiple mnt_want_write() calls in the switch statement looks really
ugly.

Signed-off-by: Miklos Szeredi <[email protected]>
Acked-by: Christoph Hellwig <[email protected]>
---
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;

2008-07-01 19:24:46

by J. Bruce Fields

Subject: Re: [patch] nfsd: clean up mnt_want_write calls

On Tue, Jul 01, 2008 at 03:38:35PM +0200, Miklos Szeredi wrote:
> From: Miklos Szeredi <[email protected]>
>
> 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 <[email protected]>
> Acked-by: Christoph Hellwig <[email protected]>
> ---
> 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;