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

Groups > linux.kernel > #1263153

[PATCH v14 04/22] 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>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Thread

[PATCH v14 00/22] Richacls (Core and Ext4) Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:40 +0100
  [PATCH v14 15/22] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 09/22] richacl: Permission check algorithm Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 10/22] posix_acl: Unexport acl_by_type and make it static Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 16/22] richacl: Create-time inheritance Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 22/22] ext4: Add richacl feature flag Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
    Re: [PATCH v14 22/22] ext4: Add richacl feature flag Andreas Dilger <adilger@dilger.ca> - 2015-11-08 09:20 +0100
  [PATCH v14 01/22] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
    Re: [PATCH v14 01/22] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Dilger <adilger@dilger.ca> - 2015-11-06 21:50 +0100
  [PATCH v14 19/22] richacl: Add richacl xattr handler Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 17/22] richacl: Automatic Inheritance Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 21/22] ext4: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 05/22] vfs: Add permission flags for setting file attributes Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 14/22] richacl: Update the file masks in chmod() Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 13/22] vfs: Cache richacl in struct inode Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 20/22] vfs: Add richacl permission checking Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 11/22] vfs: Cache base_acl objects in inodes Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
    Re: [PATCH v14 11/22] vfs: Cache base_acl objects in inodes Andreas Dilger <adilger@dilger.ca> - 2015-11-08 09:10 +0100
  [PATCH v14 12/22] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 18/22] richacl: xattr mapping functions Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
    Re: [PATCH v14 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Dilger <adilger@dilger.ca> - 2015-11-06 22:00 +0100
      Re: [PATCH v14 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-07 18:50 +0100
        Re: [PATCH v14 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Dilger <adilger@dilger.ca> - 2015-11-08 09:20 +0100
  [PATCH v14 06/22] richacl: In-memory representation and helper functions Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 12:50 +0100
  [PATCH v14 07/22] richacl: Permission mapping functions Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 13:00 +0100
  [PATCH v14 08/22] richacl: Compute maximum file masks from an acl Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 13:00 +0100
  [PATCH v14 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 13:00 +0100
    Re: [PATCH v14 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags Andreas Dilger <adilger@dilger.ca> - 2015-11-06 22:30 +0100
      Re: [PATCH v14 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD  permission flags Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-07 21:50 +0100
    Re: [PATCH v14 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags Andreas Dilger <adilger@dilger.ca> - 2015-11-06 22:30 +0100
  [PATCH v14 04/22] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher <agruenba@redhat.com> - 2015-11-05 13:00 +0100
    Re: [PATCH v14 04/22] vfs: Make the inode passed to inode_change_ok non-const Andreas Dilger <adilger@dilger.ca> - 2015-11-06 22:10 +0100

csiph-web