From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Hansen Subject: [RFC][PATCH 13/20] elevate writer count for do_sys_truncate() Date: Fri, 16 Jun 2006 16:12:23 -0700 Message-ID: <20060616231223.769620B9@localhost.localdomain> References: <20060616231213.D4C5D6AF@localhost.localdomain> Cc: linux-fsdevel@vger.kernel.org, herbert@13thfloor.at, viro@ftp.linux.org.uk, Dave Hansen Return-path: Received: from e31.co.us.ibm.com ([32.97.110.149]:57258 "EHLO e31.co.us.ibm.com") by vger.kernel.org with ESMTP id S1751576AbWFPXM2 (ORCPT ); Fri, 16 Jun 2006 19:12:28 -0400 To: linux-kernel@vger.kernel.org In-Reply-To: <20060616231213.D4C5D6AF@localhost.localdomain> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Signed-off-by: Dave Hansen --- lxc-dave/fs/open.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff -puN fs/open.c~C-elevate-writers-opens-part2-do_sys_truncate fs/open.c --- lxc/fs/open.c~C-elevate-writers-opens-part2-do_sys_truncate 2006-06-16 15:58:07.000000000 -0700 +++ lxc-dave/fs/open.c 2006-06-16 15:58:07.000000000 -0700 @@ -244,28 +244,32 @@ 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 = vfs_permission(&nd, MAY_WRITE); + if (error) + goto mnt_drop_write_and_out; + error = -EROFS; if (IS_RDONLY(inode)) - goto dput_and_out; + 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) { @@ -274,6 +278,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: _