| To: | Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>, "Theodore Ts'o" <tytso@xxxxxxx>, Andreas Dilger <adilger.kernel@xxxxxxxxx>, "J. Bruce Fields" <bfields@xxxxxxxxxxxx>, Jeff Layton <jlayton@xxxxxxxxxxxxxxx>, Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>, Anna Schumaker <anna.schumaker@xxxxxxxxxx>, Dave Chinner <david@xxxxxxxxxxxxx>, linux-ext4@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, linux-fsdevel@xxxxxxxxxxxxxxx, linux-nfs@xxxxxxxxxxxxxxx, linux-cifs@xxxxxxxxxxxxxxx, linux-api@xxxxxxxxxxxxxxx |
|---|---|
| Subject: | [PATCH v12 04/49] vfs: Make the inode passed to inode_change_ok non-const |
| From: | Andreas Gruenbacher <agruenba@xxxxxxxxxx> |
| Date: | Fri, 23 Oct 2015 20:41:17 +0200 |
| Cc: | Andreas Gruenbacher <agruenba@xxxxxxxxxx> |
| Delivered-to: | xfs@xxxxxxxxxxx |
| In-reply-to: | <1445625722-13791-1-git-send-email-agruenba@xxxxxxxxxx> |
| References: | <1445625722-13791-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>
---
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 6530ced..328be71 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 402acd7..aab32c8 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2871,7 +2871,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.5.0
|
| Previous by Date: | [PATCH v12 03/49] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags, Andreas Gruenbacher |
|---|---|
| Next by Date: | [PATCH v12 05/49] vfs: Add permission flags for setting file attributes, Andreas Gruenbacher |
| Previous by Thread: | [PATCH v12 03/49] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags, Andreas Gruenbacher |
| Next by Thread: | [PATCH v12 05/49] vfs: Add permission flags for setting file attributes, Andreas Gruenbacher |
| Indexes: | [Date] [Thread] [Top] [All Lists] |