Home » Mailing list archives » linux-kernel » 2007 » November » 1

[PATCH 18/27] r-o-bind-mounts-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@...>, <miklos@...>, <hch@...>, Dave Hansen <haveblue@...>
Subject: [PATCH 18/27] r-o-bind-mounts-elevate-write-count-over-calls-to-vfs_rename
Date: Thursday, November 1, 2007 - 7:08 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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

diff -puN fs/namei.c~r-o-bind-mounts-elevate-write-count-over-calls-to-vfs_rename fs/namei.c
--- linux-2.6.git/fs/namei.c~r-o-bind-mounts-elevate-write-count-over-calls-to-vfs_rename	2007-11-01 14:46:16.000000000 -0700
+++ linux-2.6.git-dave/fs/namei.c	2007-11-01 14:46:16.000000000 -0700
@@ -2734,8 +2734,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~r-o-bind-mounts-elevate-write-count-over-calls-to-vfs_rename fs/nfsd/vfs.c
--- linux-2.6.git/fs/nfsd/vfs.c~r-o-bind-mounts-elevate-write-count-over-calls-to-vfs_rename	2007-11-01 14:46:16.000000000 -0700
+++ linux-2.6.git-dave/fs/nfsd/vfs.c	2007-11-01 14:46:16.000000000 -0700
@@ -1668,13 +1668,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/27] Read-only bind mounts (-mm resend), Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 27/27] keep track of mnt_writer state of struct file, Dave Hansen, (Thu Nov 1, 7:09 pm)
[PATCH 25/27] r-o-bind-mounts-track-number-of-mount-writers-..., Dave Hansen, (Thu Nov 1, 7:09 pm)
Re: [PATCH 25/27] r-o-bind-mounts-track-number-of-mount-writ..., Andrew Morton, (Mon Nov 5, 7:35 pm)
[PATCH 22/27] r-o-bind-mounts-nfs-check-mnt-instead-of-super..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 24/27] r-o-bind-mounts-track-number-of-mount-writers, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 26/27] r-o-bind-mounts-honor-r-w-changes-at-do_remoun..., Dave Hansen, (Thu Nov 1, 7:09 pm)
[PATCH 19/27] r-o-bind-mounts-elevate-writer-count-for-chown..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 23/27] r-o-bind-mounts-sys_mknodat-elevate-write-coun..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 18/27] r-o-bind-mounts-elevate-write-count-over-calls..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 21/27] r-o-bind-mounts-make-access-use-mnt-check, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 20/27] r-o-bind-mounts-elevate-writer-count-for-do_sy..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 17/27] r-o-bind-mounts-elevate-write-count-opend-files, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-some-i..., Dave Hansen, (Thu Nov 1, 7:08 pm)
Re: [PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-so..., Andrew Morton, (Mon Nov 5, 7:23 pm)
Re: [PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-so..., Jan Kara, (Tue Nov 6, 5:01 am)
Re: [PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-so..., Andrew Morton, (Tue Nov 6, 5:12 am)
[PATCH 13/27] r-o-bind-mounts-elevate-write-count-for-do_uti..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 15/27] r-o-bind-mounts-elevate-write-count-for-link-a..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 12/27] r-o-bind-mounts-elevate-write-count-for-do_sys..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 11/27] r-o-bind-mounts-elevate-write-count-during-ent..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 14/27] r-o-bind-mounts-elevate-write-count-for-file_u..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 07/27] r-o-bind-mounts-do_rmdir-elevate-write-count, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 10/27] r-o-bind-mounts-elevate-mount-count-for-extend..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 01/27] do namei_flags calculation inside open_namei(), Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 09/27] r-o-bind-mounts-elevate-mnt-writers-for-vfs_un..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 06/27] r-o-bind-mounts-stub-functions, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 08/27] r-o-bind-mounts-elevate-mnt-writers-for-caller..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 05/27] rename open_namei() to open_pathname(), Dave Hansen, (Thu Nov 1, 7:08 pm)
Re: [PATCH 05/27] rename open_namei() to open_pathname(), Christoph Hellwig, (Mon Nov 26, 10:33 am)
[PATCH 04/27] kill filp_open(), Dave Hansen, (Thu Nov 1, 7:08 pm)
Re: [PATCH 04/27] kill filp_open(), Andrew Morton, (Wed Jan 16, 4:52 am)
Re: [PATCH 04/27] kill filp_open(), Dave Hansen, (Wed Jan 16, 1:04 pm)
Re: [PATCH 04/27] kill filp_open(), Bryn M. Reeves, (Wed Jan 16, 1:12 pm)
Re: [PATCH 04/27] kill filp_open(), Christoph Hellwig, (Wed Jan 16, 1:10 pm)
Re: [PATCH 04/27] kill filp_open(), Dave Hansen, (Wed Jan 16, 1:41 pm)
Re: [PATCH 04/27] kill filp_open(), Christoph Hellwig, (Wed Jan 16, 1:47 pm)
[PATCH 03/27] kill do_filp_open(), Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 02/27] make open_namei() return a filp, Dave Hansen, (Thu Nov 1, 7:08 pm)