login
Login / Register
Header Space

 
 

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

[PATCH 15/24] elevate write count over calls to vfs_rename()

Score:
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 15/24] elevate write count over calls to vfs_rename()
Date: Monday, September 17, 2007 - 2:27 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>
---

 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-17 09:44:04.000000000 -0700
+++ lxc-dave/fs/namei.c	2007-09-17 09:44:04.000000000 -0700
@@ -2655,8 +2655,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-17 09:44:04.000000000 -0700
+++ lxc-dave/fs/nfsd/vfs.c	2007-09-17 09:44:04.000000000 -0700
@@ -1659,13 +1659,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/24] Read-only bind mounts, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 00/24] Read-only bind mounts, Christoph Hellwig, (Wed Sep 19, 1:44 pm)
Re: [PATCH 00/24] Read-only bind mounts, Andrew Morton, (Wed Sep 19, 5:24 pm)
Re: [PATCH 00/24] Read-only bind mounts, Dave Hansen, (Wed Sep 19, 5:56 pm)
Re: [PATCH 00/24] Read-only bind mounts, Andrew Morton, (Wed Sep 19, 6:06 pm)
Re: [PATCH 00/24] Read-only bind mounts, Miklos Szeredi, (Thu Sep 20, 5:58 am)
Re: [PATCH 00/24] Read-only bind mounts, Serge E. Hallyn, (Wed Sep 19, 10:21 am)
[PATCH 14/24] unix_find_other() elevate write count for touc..., Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 14/24] unix_find_other() elevate write count for ..., Christoph Hellwig, (Wed Sep 19, 1:35 pm)
[PATCH 22/24] do_rmdir(): elevate write count, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 22/24] do_rmdir(): elevate write count, Christoph Hellwig, (Wed Sep 19, 1:39 pm)
[PATCH 21/24] elevate mnt writers for vfs_unlink() callers, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 21/24] elevate mnt writers for vfs_unlink() callers, Christoph Hellwig, (Wed Sep 19, 1:38 pm)
[PATCH 19/24] elevate write count for do_sys_utime() and tou..., Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 19/24] elevate write count for do_sys_utime() and..., Christoph Hellwig, (Wed Sep 19, 1:36 pm)
[PATCH 20/24] sys_mknodat(): elevate write count for vfs_mkn..., Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 20/24] sys_mknodat(): elevate write count for vfs..., Christoph Hellwig, (Wed Sep 19, 1:38 pm)
[PATCH 09/24] elevate mnt writers for callers of vfs_mkdir(), Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 09/24] elevate mnt writers for callers of vfs_mkd..., Christoph Hellwig, (Wed Sep 19, 1:32 pm)
[PATCH 04/24] r/o bind mounts: stub functions, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 04/24] r/o bind mounts: stub functions, Christoph Hellwig, (Wed Sep 19, 1:28 pm)
[PATCH 11/24] elevate write count for link and symlink calls, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 11/24] elevate write count for link and symlink c..., Christoph Hellwig, (Wed Sep 19, 1:33 pm)
[PATCH 06/24] r/o bind mounts: elevate write count for some ..., Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 06/24] r/o bind mounts: elevate write count for s..., Christoph Hellwig, (Wed Sep 19, 1:31 pm)
[PATCH 18/24] elevate write count for do_utimes(), Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 18/24] elevate write count for do_utimes(), Christoph Hellwig, (Wed Sep 19, 1:36 pm)
[PATCH 16/24] nfs: check mnt instead of superblock directly, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 16/24] nfs: check mnt instead of superblock direc..., Christoph Hellwig, (Wed Sep 19, 1:36 pm)
[PATCH 17/24] elevate writer count for do_sys_truncate(), Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 17/24] elevate writer count for do_sys_truncate(), Christoph Hellwig, (Wed Sep 19, 1:36 pm)
[PATCH 15/24] elevate write count over calls to vfs_rename(), Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 15/24] elevate write count over calls to vfs_rena..., Christoph Hellwig, (Wed Sep 19, 1:35 pm)
[PATCH 12/24] elevate mount count for extended attributes, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 12/24] elevate mount count for extended attributes, Christoph Hellwig, (Wed Sep 19, 1:34 pm)
[PATCH 10/24] elevate write count during entire ncp_ioctl(), Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 10/24] elevate write count during entire ncp_ioct..., Christoph Hellwig, (Wed Sep 19, 1:33 pm)
[PATCH 01/24] filesystem helpers for custom 'struct file's, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 01/24] filesystem helpers for custom 'struct file's, Christoph Hellwig, (Wed Sep 19, 1:26 pm)
[PATCH] docuement filesystem helpers for custom 'struct file's, Dave Hansen, (Wed Sep 19, 1:47 pm)
Re: [PATCH] docuement filesystem helpers for custom 'struct ..., Randy Dunlap, (Wed Sep 19, 6:07 pm)
Re: [PATCH] docuement filesystem helpers for custom 'struct ..., Dave Hansen, (Thu Sep 20, 1:25 pm)
Re: [PATCH] docuement filesystem helpers for custom 'struct ..., Christoph Hellwig, (Thu Sep 20, 1:30 pm)
[PATCH 05/24] elevate write count open()'d files, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 05/24] elevate write count open()'d files, Christoph Hellwig, (Wed Sep 19, 1:30 pm)
[PATCH 07/24] elevate writer count for chown and friends, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 07/24] elevate writer count for chown and friends, Christoph Hellwig, (Wed Sep 19, 1:31 pm)
[PATCH 13/24] elevate write count for file_update_time(), Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 13/24] elevate write count for file_update_time(), Christoph Hellwig, (Wed Sep 19, 1:35 pm)
[PATCH 08/24] make access() use mnt check, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 08/24] make access() use mnt check, Christoph Hellwig, (Wed Sep 19, 1:32 pm)
[PATCH 03/24] create cleanup helper svc_msnfs(), Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Jan Engelhardt, (Wed Sep 19, 1:39 pm)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Dave Hansen, (Wed Sep 19, 1:45 pm)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Trond Myklebust, (Wed Sep 19, 1:54 pm)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Christoph Hellwig, (Wed Sep 19, 1:59 pm)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Trond Myklebust, (Wed Sep 19, 2:10 pm)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Christoph Hellwig, (Wed Sep 19, 1:28 pm)
[PATCH 02/24] rearrange may_open() to be r/o friendly, Dave Hansen, (Mon Sep 17, 2:27 pm)
Re: [PATCH 02/24] rearrange may_open() to be r/o friendly, Christoph Hellwig, (Wed Sep 19, 1:27 pm)
Re: [PATCH 02/24] rearrange may_open() to be r/o friendly, Dave Hansen, (Thu Sep 20, 2:47 pm)

Mail archive search
Enter your search terms.
Optionally limit your search to a specific mailing list.
advanced
Recent Tags
more tags
Colocation donated by:
Who's online
There are currently 2 users and 938 guests online.

Online users

Syndicate
Syndicate content
© 2007 KernelTrap.  |  Powered by Drupal.  |  Legal statement.
speck-geostationary