[patch 22/22] elevate mnt writers for vfs_unlink() callers

Cedric Le Goater clg at fr.ibm.com
Thu Jun 7 08:25:49 PDT 2007


From: Dave Hansen <hansendc at us.ibm.com>

Signed-off-by: Dave Hansen <hansendc at us.ibm.com>
---

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

Index: 2.6.22-rc4-mm2-robindmount/fs/namei.c
===================================================================
--- 2.6.22-rc4-mm2-robindmount.orig/fs/namei.c
+++ 2.6.22-rc4-mm2-robindmount/fs/namei.c
@@ -2227,7 +2227,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);
 	}
Index: 2.6.22-rc4-mm2-robindmount/ipc/mqueue.c
===================================================================
--- 2.6.22-rc4-mm2-robindmount.orig/ipc/mqueue.c
+++ 2.6.22-rc4-mm2-robindmount/ipc/mqueue.c
@@ -750,8 +750,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);
 

-- 


More information about the Containers mailing list