[PATCH 11/30] r/o bind mounts: elevate write count for callers of vfs_mkdir()

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux-kernel@...>
Cc: <hch@...>, <miklos@...>, <akpm@...>, Dave Hansen <haveblue@...>
Date: Friday, February 15, 2008 - 6:37 pm

Pretty self-explanatory.  Fits in with the rest of the series.

Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 linux-2.6.git-dave/fs/namei.c            |    5 +++++
 linux-2.6.git-dave/fs/nfsd/nfs4recover.c |    5 +++++
 2 files changed, 10 insertions(+)

diff -puN fs/namei.c~r-o-bind-mounts-elevate-mnt-writers-for-callers-of-vfs_mkdir fs/namei.c
--- linux-2.6.git/fs/namei.c~r-o-bind-mounts-elevate-mnt-writers-for-callers-of-vfs_mkdir	2008-02-15 13:25:47.000000000 -0800
+++ linux-2.6.git-dave/fs/namei.c	2008-02-15 13:25:47.000000000 -0800
@@ -2082,7 +2082,12 @@ asmlinkage long sys_mkdirat(int dfd, con
 
 	if (!IS_POSIXACL(nd.path.dentry->d_inode))
 		mode &= ~current->fs->umask;
+	error = mnt_want_write(nd.path.mnt);
+	if (error)
+		goto out_dput;
 	error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
+	mnt_drop_write(nd.path.mnt);
+out_dput:
 	dput(dentry);
 out_unlock:
 	mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
diff -puN fs/nfsd/nfs4recover.c~r-o-bind-mounts-elevate-mnt-writers-for-callers-of-vfs_mkdir fs/nfsd/nfs4recover.c
--- linux-2.6.git/fs/nfsd/nfs4recover.c~r-o-bind-mounts-elevate-mnt-writers-for-callers-of-vfs_mkdir	2008-02-15 13:25:47.000000000 -0800
+++ linux-2.6.git-dave/fs/nfsd/nfs4recover.c	2008-02-15 13:25:47.000000000 -0800
@@ -41,6 +41,7 @@
 #include <linux/nfsd/xdr4.h>
 #include <linux/param.h>
 #include <linux/file.h>
+#include <linux/mount.h>
 #include <linux/namei.h>
 #include <asm/uaccess.h>
 #include <linux/scatterlist.h>
@@ -154,7 +155,11 @@ nfsd4_create_clid_dir(struct nfs4_client
 		dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
 		goto out_put;
 	}
+	status = mnt_want_write(rec_dir.mnt);
+	if (status)
+		goto out_put;
 	status = vfs_mkdir(rec_dir.path.dentry->d_inode, dentry, S_IRWXU);
+	mnt_drop_write(rec_dir.mnt);
 out_put:
 	dput(dentry);
 out_unlock:
_
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/30] Read-only bind mounts (-mm resend), Dave Hansen, (Fri Feb 15, 6:37 pm)
[PATCH] r/o bind mounts: stub functions, Dave Hansen, (Fri Feb 15, 9:32 pm)
[PATCH 06/30] merge open_namei() and do_filp_open(), Dave Hansen, (Fri Feb 15, 6:37 pm)
[PATCH 11/30] r/o bind mounts: elevate write count for calle..., Dave Hansen, (Fri Feb 15, 6:37 pm)
[PATCH 03/30] check for null vfsmount in dentry_open(), Dave Hansen, (Fri Feb 15, 6:37 pm)
[PATCH 07/30] r/o bind mounts: stub functions, Dave Hansen, (Fri Feb 15, 6:37 pm)
Re: [PATCH 07/30] r/o bind mounts: stub functions, Theodore Tso, (Fri Feb 15, 8:32 pm)
Re: [PATCH 07/30] r/o bind mounts: stub functions, Dave Hansen, (Fri Feb 15, 8:49 pm)
Re: [PATCH 07/30] r/o bind mounts: stub functions, Theodore Tso, (Fri Feb 15, 9:00 pm)
Re: [PATCH 07/30] r/o bind mounts: stub functions, Andrew Morton, (Fri Feb 15, 9:11 pm)
Re: [PATCH 07/30] r/o bind mounts: stub functions, Christoph Hellwig, (Sat Feb 16, 2:31 am)
Re: [PATCH 07/30] r/o bind mounts: stub functions, Dave Hansen, (Wed Feb 20, 6:25 pm)
Re: [PATCH 07/30] r/o bind mounts: stub functions, Christoph Hellwig, (Wed Feb 20, 6:58 pm)
Re: [PATCH 07/30] r/o bind mounts: stub functions, Andrew Morton, (Sat Feb 16, 2:46 am)
Re: [PATCH 07/30] r/o bind mounts: stub functions, Dave Hansen, (Mon Feb 18, 3:06 am)
[PATCH 04/30] fix up new filp allocators, Dave Hansen, (Fri Feb 15, 6:37 pm)
[PATCH 02/30] hppfs pass vfsmount to dentry_open(), Dave Hansen, (Fri Feb 15, 6:37 pm)