From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752384AbXITT6y (ORCPT ); Thu, 20 Sep 2007 15:58:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752805AbXITTx0 (ORCPT ); Thu, 20 Sep 2007 15:53:26 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:51355 "EHLO e36.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752308AbXITTxR (ORCPT ); Thu, 20 Sep 2007 15:53:17 -0400 Subject: [PATCH 19/25] elevate write count for do_utimes() To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Dave Hansen From: Dave Hansen Date: Thu, 20 Sep 2007 12:53:13 -0700 References: <20070920195249.852667D5@kernel> In-Reply-To: <20070920195249.852667D5@kernel> Message-Id: <20070920195313.126F343E@kernel> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Acked-by: Christoph Hellwig Signed-off-by: Dave Hansen --- lxc-dave/fs/utimes.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff -puN fs/utimes.c~elevate-write-count-for-do-utimes fs/utimes.c --- lxc/fs/utimes.c~elevate-write-count-for-do-utimes 2007-09-20 12:16:20.000000000 -0700 +++ lxc-dave/fs/utimes.c 2007-09-20 12:16:20.000000000 -0700 @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -75,8 +76,8 @@ long do_utimes(int dfd, char __user *fil inode = dentry->d_inode; - error = -EROFS; - if (IS_RDONLY(inode)) + error = mnt_want_write(nd.mnt); + if (error) goto dput_and_out; /* Don't worry, the checks are done in inode_change_ok() */ @@ -84,7 +85,7 @@ long do_utimes(int dfd, char __user *fil if (times) { error = -EPERM; if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) - goto dput_and_out; + goto mnt_drop_write_and_out; if (times[0].tv_nsec == UTIME_OMIT) newattrs.ia_valid &= ~ATTR_ATIME; @@ -104,22 +105,24 @@ long do_utimes(int dfd, char __user *fil } else { error = -EACCES; if (IS_IMMUTABLE(inode)) - goto dput_and_out; + goto mnt_drop_write_and_out; if (!is_owner_or_cap(inode)) { if (f) { if (!(f->f_mode & FMODE_WRITE)) - goto dput_and_out; + goto mnt_drop_write_and_out; } else { error = vfs_permission(&nd, MAY_WRITE); if (error) - goto dput_and_out; + goto mnt_drop_write_and_out; } } } mutex_lock(&inode->i_mutex); error = notify_change(dentry, &newattrs); mutex_unlock(&inode->i_mutex); +mnt_drop_write_and_out: + mnt_drop_write(nd.mnt); dput_and_out: if (f) fput(f); _