Home » Mailing list archives » linux-kernel » 2007 » September » 20

[PATCH 16/25] elevate write count over calls to vfs_rename()

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Dave Hansen <haveblue@...>
To: <akpm@...>
Cc: <linux-kernel@...>, <hch@...>, Dave Hansen <haveblue@...>
Subject: [PATCH 16/25] elevate write count over calls to vfs_rename()
Date: Thursday, September 20, 2007 - 3:53 pm

This also uses the little helper in the NFS code to
make an if() a little bit less ugly.  We introduced
the helper at the beginning of the series.

Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Acked-by: Christoph Hellwig <hch@infradead.org>
---

 lxc-dave/fs/namei.c    |    4 ++++
 lxc-dave/fs/nfsd/vfs.c |   15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff -puN fs/namei.c~elevate-write-count-over-calls-to-vfs-rename fs/namei.c
--- lxc/fs/namei.c~elevate-write-count-over-calls-to-vfs-rename	2007-09-20 12:16:18.000000000 -0700
+++ lxc-dave/fs/namei.c	2007-09-20 12:16:18.000000000 -0700
@@ -2630,8 +2630,12 @@ static int do_rename(int olddfd, const c
 	if (new_dentry == trap)
 		goto exit5;
 
+	error = mnt_want_write(oldnd.mnt);
+	if (error)
+		goto exit5;
 	error = vfs_rename(old_dir->d_inode, old_dentry,
 				   new_dir->d_inode, new_dentry);
+	mnt_drop_write(oldnd.mnt);
 exit5:
 	dput(new_dentry);
 exit4:
diff -puN fs/nfsd/vfs.c~elevate-write-count-over-calls-to-vfs-rename fs/nfsd/vfs.c
--- lxc/fs/nfsd/vfs.c~elevate-write-count-over-calls-to-vfs-rename	2007-09-20 12:16:18.000000000 -0700
+++ lxc-dave/fs/nfsd/vfs.c	2007-09-20 12:16:18.000000000 -0700
@@ -1651,13 +1651,20 @@ nfsd_rename(struct svc_rqst *rqstp, stru
 	if (ndentry == trap)
 		goto out_dput_new;
 
-#ifdef MSNFS
-	if ((ffhp->fh_export->ex_flags & NFSEXP_MSNFS) &&
+	if (svc_msnfs(ffhp) &&
 		((atomic_read(&odentry->d_count) > 1)
 		 || (atomic_read(&ndentry->d_count) > 1))) {
 			host_err = -EPERM;
-	} else
-#endif
+			goto out_dput_new;
+	}
+
+	host_err = -EXDEV;
+	if (ffhp->fh_export->ex_mnt != tfhp->fh_export->ex_mnt)
+		goto out_dput_new;
+	host_err = mnt_want_write(ffhp->fh_export->ex_mnt);
+	if (host_err)
+		goto out_dput_new;
+
 	host_err = vfs_rename(fdir, odentry, tdir, ndentry);
 	if (!host_err && EX_ISSYNC(tfhp->fh_export)) {
 		host_err = nfsd_sync_dir(tdentry);
_
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/25] Read-only bind mounts, Dave Hansen, (Thu Sep 20, 3:52 pm)
[PATCH 24/25] r/o bind mounts: track number of mount writers, Dave Hansen, (Thu Sep 20, 3:53 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Christoph Hellwig, (Mon Sep 24, 1:54 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Dave Hansen, (Mon Sep 24, 3:28 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Andrew Morton, (Mon Sep 24, 3:42 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Dave Hansen, (Mon Oct 1, 2:06 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Andrew Morton, (Mon Sep 24, 3:10 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Christoph Hellwig, (Mon Sep 24, 3:24 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Andrew Morton, (Mon Sep 24, 2:17 am)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Dave Hansen, (Mon Sep 24, 6:06 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Andrew Morton, (Mon Sep 24, 6:25 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Dave Hansen, (Mon Sep 24, 7:05 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Andrew Morton, (Mon Sep 24, 7:15 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Dave Hansen, (Tue Sep 25, 12:10 pm)
Re: [PATCH 24/25] r/o bind mounts: track number of mount wri..., Arjan van de Ven, (Mon Sep 24, 10:34 am)
[PATCH 25/25] honor r/w changes at do_remount() time, Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 23/25] do_rmdir(): elevate write count, Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 22/25] elevate mnt writers for vfs_unlink() callers, Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 21/25] sys_mknodat(): elevate write count for vfs_mkn..., Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 13/25] elevate mount count for extended attributes, Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 06/25] elevate write count open()'d files, Dave Hansen, (Thu Sep 20, 3:52 pm)
Re: [PATCH 06/25] elevate write count open()'d files, Andrew Morton, (Wed Nov 28, 4:41 am)
Re: [PATCH 06/25] elevate write count open()'d files, Dave Hansen, (Wed Nov 28, 1:33 pm)
[PATCH 20/25] elevate write count for do_sys_utime() and tou..., Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 19/25] elevate write count for do_utimes(), Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 18/25] elevate writer count for do_sys_truncate(), Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 14/25] elevate write count for file_update_time(), Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 17/25] nfs: check mnt instead of superblock directly, Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 02/25] rearrange may_open() to be r/o friendly, Dave Hansen, (Thu Sep 20, 3:52 pm)
[PATCH 16/25] elevate write count over calls to vfs_rename(), Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 15/25] unix_find_other() elevate write count for touc..., Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 10/25] elevate mnt writers for callers of vfs_mkdir(), Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 07/25] r/o bind mounts: elevate write count for some ..., Dave Hansen, (Thu Sep 20, 3:52 pm)
Re: [PATCH 07/25] r/o bind mounts: elevate write count for s..., Andrew Morton, (Fri Sep 21, 7:03 pm)
Re: [PATCH 07/25] r/o bind mounts: elevate write count for s..., Dave Hansen, (Fri Sep 21, 7:39 pm)
Re: [PATCH 07/25] r/o bind mounts: elevate write count for s..., Andrew Morton, (Fri Sep 21, 7:47 pm)
Re: [PATCH 07/25] r/o bind mounts: elevate write count for s..., Andrew Morton, (Fri Sep 21, 4:17 am)
[RFC] detect missed mnt_want_write() calls, Dave Hansen, (Tue Sep 25, 9:34 pm)
Re: [PATCH 07/25] r/o bind mounts: elevate write count for s..., Dave Hansen, (Fri Sep 21, 5:15 pm)
[PATCH 08/25] elevate writer count for chown and friends, Dave Hansen, (Thu Sep 20, 3:52 pm)
[PATCH 12/25] elevate write count for link and symlink calls, Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 11/25] elevate write count during entire ncp_ioctl(), Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 09/25] make access() use mnt check, Dave Hansen, (Thu Sep 20, 3:53 pm)
[PATCH 05/25] r/o bind mounts: stub functions, Dave Hansen, (Thu Sep 20, 3:52 pm)
[PATCH 04/25] create cleanup helper svc_msnfs(), Dave Hansen, (Thu Sep 20, 3:52 pm)
[PATCH 03/25] give may_open() a local 'mnt' variable, Dave Hansen, (Thu Sep 20, 3:52 pm)
Re: [PATCH 03/25] give may_open() a local 'mnt' variable, Christoph Hellwig, (Thu Sep 20, 3:57 pm)
[PATCH 01/25] filesystem helpers for custom 'struct file's, Dave Hansen, (Thu Sep 20, 3:52 pm)