[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20080215223737.0C17BC2D@kernel>
Date: Fri, 15 Feb 2008 14:37:37 -0800
From: Dave Hansen <haveblue@...ibm.com>
To: linux-kernel@...r.kernel.org
Cc: hch@....de, miklos@...redi.hu, akpm@...l.org,
Dave Hansen <haveblue@...ibm.com>
Subject: [PATCH 12/30] r/o bind mounts: elevate mnt_writers for unlink callers
Acked-by: Al Viro <viro@...IV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch@....de>
Signed-off-by: Dave Hansen <haveblue@...ibm.com>
---
linux-2.6.git-dave/fs/namei.c | 4 ++++
linux-2.6.git-dave/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
--- linux-2.6.git/fs/namei.c~r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers 2008-02-15 13:25:48.000000000 -0800
+++ linux-2.6.git-dave/fs/namei.c 2008-02-15 13:25:48.000000000 -0800
@@ -2280,7 +2280,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.path.mnt);
+ if (error)
+ goto exit2;
error = vfs_unlink(nd.path.dentry->d_inode, dentry);
+ mnt_drop_write(nd.path.mnt);
exit2:
dput(dentry);
}
diff -puN ipc/mqueue.c~r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers ipc/mqueue.c
--- linux-2.6.git/ipc/mqueue.c~r-o-bind-mounts-elevate-mnt-writers-for-vfs_unlink-callers 2008-02-15 13:25:48.000000000 -0800
+++ linux-2.6.git-dave/ipc/mqueue.c 2008-02-15 13:25:48.000000000 -0800
@@ -742,8 +742,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);
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists