xfs
[Top] [All Lists]

[PATCH v18 04/22] vfs: Make the inode passed to inode_change_ok non-cons

To: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Subject: [PATCH v18 04/22] vfs: Make the inode passed to inode_change_ok non-const
From: Andreas Gruenbacher <agruenba@xxxxxxxxxx>
Date: Mon, 29 Feb 2016 09:17:09 +0100
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>, linux-nfs@xxxxxxxxxxxxxxx, "Theodore Ts'o" <tytso@xxxxxxx>, linux-cifs@xxxxxxxxxxxxxxx, linux-api@xxxxxxxxxxxxxxx, Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx, Christoph Hellwig <hch@xxxxxxxxxxxxx>, Andreas Dilger <adilger.kernel@xxxxxxxxx>, linux-fsdevel@xxxxxxxxxxxxxxx, Jeff Layton <jlayton@xxxxxxxxxxxxxxx>, linux-ext4@xxxxxxxxxxxxxxx, Anna Schumaker <anna.schumaker@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1456733847-17982-1-git-send-email-agruenba@xxxxxxxxxx>
References: <1456733847-17982-1-git-send-email-agruenba@xxxxxxxxxx>
We will need to call iop->permission and iop->get_acl from
inode_change_ok() for additional permission checks, and both take a
non-const inode.

Signed-off-by: Andreas Gruenbacher <agruenba@xxxxxxxxxx>
Reviewed-by: J. Bruce Fields <bfields@xxxxxxxxxx>
Reviewed-by: Andreas Dilger <adilger@xxxxxxxxx>
---
 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 25b24d0..7ca7fa0 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -28,7 +28,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 97e34ba..efff04f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2908,7 +2908,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);
 
-- 
2.4.3

<Prev in Thread] Current Thread [Next in Thread>