---

 lxc-dave/fs/namei.c   |    4 ++++
 lxc-dave/ipc/mqueue.c |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff -puN fs/namei.c~elevate-writers-vfs_unlink fs/namei.c
--- lxc/fs/namei.c~elevate-writers-vfs_unlink	2006-06-01 14:50:59.000000000 -0700
+++ lxc-dave/fs/namei.c	2006-06-01 14:53:40.000000000 -0700
@@ -2101,7 +2101,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_put_write(nd.mnt);
 	exit2:
 		dput(dentry);
 	}
diff -puN fs/nfsd/nfs4recover.c~elevate-writers-vfs_unlink fs/nfsd/nfs4recover.c
diff -puN fs/nfsd/vfs.c~elevate-writers-vfs_unlink fs/nfsd/vfs.c
diff -puN ipc/mqueue.c~elevate-writers-vfs_unlink ipc/mqueue.c
--- lxc/ipc/mqueue.c~elevate-writers-vfs_unlink	2006-06-01 14:55:53.000000000 -0700
+++ lxc-dave/ipc/mqueue.c	2006-06-01 14:58:40.000000000 -0700
@@ -738,8 +738,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_put_write(mqueue_mnt);
 out_err:
 	dput(dentry);
 
_