From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Hansen Subject: [RFC][PATCH 17/20] elevate mnt writers for vfs_unlink() callers Date: Fri, 16 Jun 2006 16:12:26 -0700 Message-ID: <20060616231226.33108E61@localhost.localdomain> References: <20060616231213.D4C5D6AF@localhost.localdomain> Cc: linux-fsdevel@vger.kernel.org, herbert@13thfloor.at, viro@ftp.linux.org.uk, Dave Hansen Return-path: Received: from e3.ny.us.ibm.com ([32.97.182.143]:2016 "EHLO e3.ny.us.ibm.com") by vger.kernel.org with ESMTP id S932100AbWFPXMb (ORCPT ); Fri, 16 Jun 2006 19:12:31 -0400 To: linux-kernel@vger.kernel.org In-Reply-To: <20060616231213.D4C5D6AF@localhost.localdomain> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Signed-off-by: Dave Hansen --- lxc-dave/fs/namei.c | 4 ++++ lxc-dave/ipc/mqueue.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff -puN fs/namei.c~C-elevate-writers-vfs_unlink fs/namei.c --- lxc/fs/namei.c~C-elevate-writers-vfs_unlink 2006-06-16 15:58:10.000000000 -0700 +++ lxc-dave/fs/namei.c 2006-06-16 15:58:10.000000000 -0700 @@ -2136,7 +2136,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~C-elevate-writers-vfs_unlink ipc/mqueue.c --- lxc/ipc/mqueue.c~C-elevate-writers-vfs_unlink 2006-06-16 15:58:10.000000000 -0700 +++ lxc-dave/ipc/mqueue.c 2006-06-16 15:58:10.000000000 -0700 @@ -741,8 +741,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); _