From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers.patch removed from -mm tree Date: Thu, 15 Feb 2007 00:33:41 -0800 Message-ID: <200702150833.l1F8XfGU024658@shell0.pdx.osdl.net> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp.osdl.org ([65.172.181.24]:39807 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965327AbXBOIpS (ORCPT ); Thu, 15 Feb 2007 03:45:18 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: hansendc@us.ibm.com, haveblue@us.ibm.com, hch@lst.de, miklos@szeredi.hu, viro@zeniv.linux.org.uk, mm-commits@vger.kernel.org The patch titled r/o bind mounts: elevate mnt writers for vfs_unlink() callers has been removed from the -mm tree. Its filename was r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers.patch This patch was dropped because it had testing failures ------------------------------------------------------ Subject: r/o bind mounts: elevate mnt writers for vfs_unlink() callers From: Dave Hansen Signed-off-by: Dave Hansen Cc: Al Viro Cc: Christoph Hellwig Cc: Miklos Szeredi Signed-off-by: Andrew Morton --- fs/namei.c | 4 ++++ ipc/mqueue.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff -puN fs/namei.c~r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers fs/namei.c --- a/fs/namei.c~r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers +++ a/fs/namei.c @@ -2175,7 +2175,11 @@ static long do_unlinkat(int dfd, const c inode = dentry->d_inode; if (inode) atomic_inc(&inode->i_count); + error = mnt_want_write(nd.mnt); + if (error) + goto exit2; error = vfs_unlink(nd.dentry->d_inode, dentry); + mnt_drop_write(nd.mnt); exit2: dput(dentry); } diff -puN ipc/mqueue.c~r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers ipc/mqueue.c --- a/ipc/mqueue.c~r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers +++ a/ipc/mqueue.c @@ -749,8 +749,11 @@ asmlinkage long sys_mq_unlink(const char inode = dentry->d_inode; if (inode) atomic_inc(&inode->i_count); - + err = mnt_want_write(mqueue_mnt); + if (err) + goto out_err; err = vfs_unlink(dentry->d_parent->d_inode, dentry); + mnt_drop_write(mqueue_mnt); out_err: dput(dentry); _ Patches currently in -mm which might be from hansendc@us.ibm.com are r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers.patch r-o-bind-mounts-do_rmdir-elevate-write-count.patch r-o-bind-mounts-elevate-writer-count-for-custom-struct_file.patch r-o-bind-mounts-remove-is_rdonly-from-permission.patch r-o-bind-mounts-reiser4-remove-is_rdonly-checks.patch