[patch 19/22] elevate writer count for do_sys_truncate()
Cedric Le Goater
clg at fr.ibm.com
Thu Jun 7 08:25:46 PDT 2007
From: Dave Hansen <hansendc at us.ibm.com>
Signed-off-by: Dave Hansen <hansendc at us.ibm.com>
---
---
fs/open.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
Index: 2.6.22-rc4-mm2-robindmount/fs/open.c
===================================================================
--- 2.6.22-rc4-mm2-robindmount.orig/fs/open.c
+++ 2.6.22-rc4-mm2-robindmount/fs/open.c
@@ -243,28 +243,28 @@ static long do_sys_truncate(const char _
if (!S_ISREG(inode->i_mode))
goto dput_and_out;
- error = vfs_permission(&nd, MAY_WRITE);
+ error = mnt_want_write(nd.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;
/*
* Make sure that there are no leases.
*/
error = break_lease(inode, FMODE_WRITE);
if (error)
- 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;
error = locks_verify_truncate(inode, NULL, length);
if (!error) {
@@ -273,6 +273,8 @@ static long do_sys_truncate(const char _
}
put_write_access(inode);
+mnt_drop_write_and_out:
+ mnt_drop_write(nd.mnt);
dput_and_out:
path_release(&nd);
out:
--
More information about the Containers
mailing list