Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1357337

[PATCH v19 04/23] vfs: Make the inode passed to inode_change_ok non-const

Show all headers | View raw

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@redhat.com>
Reviewed-by: J. Bruce Fields <bfields@redhat.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
---
 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.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v19 00/23] Richacls (Core and Ext4) Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:00 +0100
  [PATCH v19 21/23] vfs: Add richacl permission checking Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:00 +0100
  [PATCH v19 10/23] posix_acl: Unexport acl_by_type and make it static Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:00 +0100
  [PATCH v19 09/23] richacl: Permission check algorithm Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:10 +0100
  [PATCH v19 08/23] richacl: Compute maximum file masks from an acl Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:10 +0100
  [PATCH v19 04/23] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:10 +0100
  [PATCH v19 01/23] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:10 +0100
  [PATCH v19 11/23] posix_acl: Improve xattr fixup code Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:10 +0100
  [PATCH v19 03/23] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:10 +0100
  [PATCH v19 13/23] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:10 +0100
  [PATCH v19 07/23] richacl: Permission mapping functions Andreas Gruenbacher <agruenba@redhat.com> - 2016-03-14 16:10 +0100

csiph-web