From f220275bec5219c4ac408b12b9b1cb8e78678f8d Mon Sep 17 00:00:00 2001
From: Dave Hansen <haveblue@us.ibm.com>
Date: Fri, 15 Feb 2008 14:37:52 -0800
Subject: [PATCH] --- yaml --- r: 90959 b: refs/heads/master c:
 9ac9b8474c39c3ae2c2b37d8e1f08db8a9146124 h: refs/heads/master i:   90957:
 e2ad2ad64ea6efef953f8b5b960fd6508686e7ca   90955:
 973939c1b23bce0b1b22cdd1028540cd5b951dd5   90951:
 2cee23fa571825c102fd5f5687eec4ef21f159bd   90943:
 873d820d9592d0be4ceee52c89d37c26abab2b7e v: v3

---
 [refs]          |  2 +-
 trunk/fs/open.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 71f8ff229256..83afb973e7fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2af482a7edfb8810539cacc2fdd8242611ca43bb
+refs/heads/master: 9ac9b8474c39c3ae2c2b37d8e1f08db8a9146124
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
index e2df8fd1eb0b..4d690e33446f 100644
--- a/trunk/fs/open.c
+++ b/trunk/fs/open.c
@@ -244,21 +244,21 @@ static long do_sys_truncate(const char __user * path, loff_t length)
 	if (!S_ISREG(inode->i_mode))
 		goto dput_and_out;
 
-	error = vfs_permission(&nd, MAY_WRITE);
+	error = mnt_want_write(nd.path.mnt);
 	if (error)
 		goto dput_and_out;
 
-	error = -EROFS;
-	if (IS_RDONLY(inode))
-		goto dput_and_out;
+	error = vfs_permission(&nd, MAY_WRITE);
+	if (error)
+		goto mnt_drop_write_and_out;
 
 	error = -EPERM;
 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-		goto dput_and_out;
+		goto mnt_drop_write_and_out;
 
 	error = get_write_access(inode);
 	if (error)
-		goto dput_and_out;
+		goto mnt_drop_write_and_out;
 
 	/*
 	 * Make sure that there are no leases.  get_write_access() protects
@@ -276,6 +276,8 @@ static long do_sys_truncate(const char __user * path, loff_t length)
 
 put_write_and_out:
 	put_write_access(inode);
+mnt_drop_write_and_out:
+	mnt_drop_write(nd.path.mnt);
 dput_and_out:
 	path_put(&nd.path);
 out: