From: "Aneesh Kumar K.V" Subject: [PATCH -V4 10/11] vfs: Make the inode passed to inode_change_ok non-const Date: Fri, 24 Sep 2010 18:18:13 +0530 Message-ID: <1285332494-12756-11-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1285332494-12756-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Cc: aneesh.kumar@linux.vnet.ibm.com, linux-fsdevel@vger.kernel.org, nfsv4@linux-nfs.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org To: sfrench@us.ibm.com, ffilz@us.ibm.com, agruen@suse.de, adilger@sun.com, sandeen@redhat.com, tytso@mit.edu, bfields@citi.umich.edu, jlayton@redhat.com Return-path: Received: from e28smtp03.in.ibm.com ([122.248.162.3]:35772 "EHLO e28smtp03.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932124Ab0IXMtH (ORCPT ); Fri, 24 Sep 2010 08:49:07 -0400 In-Reply-To: <1285332494-12756-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: From: Andreas Gruenbacher We will need to call iop->permission and iop->change_acl from inode_change_ok() for additional permission checks, and both take a non-const inode. Signed-off-by: Andreas Gruenbacher Signed-off-by: Aneesh Kumar K.V --- fs/attr.c | 2 +- include/linux/fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/attr.c b/fs/attr.c index 7ca4181..f081b5a 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -26,7 +26,7 @@ * Should be called as the first thing in ->setattr implementations, * possibly after taking additional locks. */ -int inode_change_ok(const struct inode *inode, struct iattr *attr) +int inode_change_ok(struct inode *inode, struct iattr *attr) { unsigned int ia_valid = attr->ia_valid; diff --git a/include/linux/fs.h b/include/linux/fs.h index 845a930..2616d34 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2402,7 +2402,7 @@ extern int buffer_migrate_page(struct address_space *, #define buffer_migrate_page NULL #endif -extern int inode_change_ok(const struct inode *, struct iattr *); +extern int inode_change_ok(struct inode *, struct iattr *); extern int inode_newsize_ok(const struct inode *, loff_t offset); extern void setattr_copy(struct inode *inode, const struct iattr *attr); -- 1.7.0.4