posix_acl: xattr representation cleanups
Subsystems (3)
PATCH 1/2 posix_acl: xattr representation cleanups
Remove the unnecessary typedefs and the zero-length a_entries array in struct posix_acl_xattr_header.
Signed-off-by Andreas Gruenbacher <[email protected]>
--- drivers/staging/lustre/lustre/include/lustre_acl.h | 6 +-- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 44 ++++++++++------------ fs/btrfs/send.c | 2 +- fs/cifs/cifssmb.c | 14 ++++--- fs/posix_acl.c | 18 ++++----- include/linux/posix_acl_xattr.h | 21 +++++------ 6 files changed, 51 insertions(+), 54 deletions(-)
drivers/staging/lustre/lustre/include/lustre_acl.h +3 -3
@@ -38,8 +38,8 @@#include <linux/posix_acl_xattr.h> #define LUSTRE_POSIX_ACL_MAX_ENTRIES 32 -#define LUSTRE_POSIX_ACL_MAX_SIZE \ - (sizeof(posix_acl_xattr_header) + \ - LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry)) +#define LUSTRE_POSIX_ACL_MAX_SIZE \ + (sizeof(struct posix_acl_xattr_header) + \ + LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(struct posix_acl_xattr_entry))#endif
drivers/staging/lustre/lustre/ptlrpc/wiretest.c +20 -24
52 lines not on this page · raw message
fs/btrfs/send.c +1 -1
@@ -4329,7 +4329,7 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key,int ret;struct send_ctx *sctx = ctx;struct fs_path *p; -posix_acl_xattr_header dummy_acl; +struct posix_acl_xattr_header dummy_acl; p =fs_path_alloc ();if (!p)
fs/cifs/cifssmb.c +8 -6
@@ -3334,7 +3334,7 @@ CIFSSMB_set_compression(const unsigned int xid, struct cifs_tcon *tcon,#ifdef CONFIG_CIFS_POSIX /*Convert an Access Control Entry from wire format to local POSIX xattr format*/ -static void cifs_convert_ace (posix_acl_xattr_entry *ace, +static void cifs_convert_ace (struct posix_acl_xattr_entry *ace,struct cifs_posix_ace *cifs_ace) {/* u8 cifs fields do not need le conversion */
@@ -3358,7 +3358,7 @@ static int cifs_copy_posix_acl(char *trgt, char *src, const int buflen,__u16 count;struct cifs_posix_ace *pACE;struct cifs_posix_acl *cifs_acl = (struct cifs_posix_acl *)src; -posix_acl_xattr_header *local_acl = (posix_acl_xattr_header *)trgt; +struct posix_acl_xattr_header *local_acl = (void *)trgt;if (le16_to_cpu (cifs_acl->version) !=CIFS_ACL_VERSION )return -EOPNOTSUPP ;
@@ -3396,9 +3396,11 @@ static int cifs_copy_posix_acl(char *trgt, char *src, const int buflen, }else if (size > buflen) {return -ERANGE ; }else /* buffer big enough */ { +struct posix_acl_xattr_entry *ace = (void *)(local_acl +1 ); + local_acl->a_version =cpu_to_le32 (POSIX_ACL_XATTR_VERSION );for (i =0 ; i < count ; i++) { -cifs_convert_ace (&local_acl->a_entries[i], pACE); +cifs_convert_ace (&ace[i], pACE); pACE++; } }
@@ -3406,7 +3408,7 @@ static int cifs_copy_posix_acl(char *trgt, char *src, const int buflen, }static __u16 convert_ace_to_cifs_ace (struct cifs_posix_ace *cifs_ace, -const posix_acl_xattr_entry *local_ace) +const struct posix_acl_xattr_entry *local_ace) {__u16 rc =0 ;/* 0 = ACL converted ok */
@@ -3431,7 +3433,7 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL, {__u16 rc =0 ;struct cifs_posix_acl *cifs_acl = (struct cifs_posix_acl *)parm_data; -posix_acl_xattr_header *local_acl = (posix_acl_xattr_header *)pACL; +struct posix_acl_xattr_header *local_acl = (void *)pACL;int count;int i;
@@ -3459,7 +3461,7 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL, }for (i =0 ; i < count; i++) { rc =convert_ace_to_cifs_ace (&cifs_acl->ace_array[i], - &local_acl->a_entries[i]); + (struct posix_acl_xattr_entry *)(local_acl +1 ));if (rc !=0 ) {/* ACE not converted */ break ;
fs/posix_acl.c +9 -9
@@ -633,15 +633,15 @@ static void posix_acl_fix_xattr_userns( struct user_namespace *to, struct user_namespace *from, void *value, size_t size) { - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value; -posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1 ), *end; + struct posix_acl_xattr_header *header = value; +struct posix_acl_xattr_entry *entry = (void *)(header +1 ), *end;int count;kuid_t uid;kgid_t gid;if (!value)return ; -if (size <sizeof (posix_acl_xattr_header)) +if (size <sizeof (struct posix_acl_xattr_header ))return ;if (header->a_version !=cpu_to_le32 (POSIX_ACL_XATTR_VERSION ))return ;
@@ -691,15 +691,15 @@ struct posix_acl * posix_acl_from_xattr(struct user_namespace *user_ns, const void *value, size_t size) { - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value; -posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1 ), *end; + const struct posix_acl_xattr_header *header = value; +const struct posix_acl_xattr_entry *entry = (const void *)(header +1 ), *end;int count;struct posix_acl *acl;struct posix_acl_entry *acl_e;if (!value)return NULL ; -if (size <sizeof (posix_acl_xattr_header)) +if (size <sizeof (struct posix_acl_xattr_header ))return ERR_PTR (-EINVAL );if (header->a_version !=cpu_to_le32 (POSIX_ACL_XATTR_VERSION ))return ERR_PTR (-EOPNOTSUPP );
@@ -760,8 +760,8 @@ int posix_acl_to_xattr(struct user_namespace *user_ns, const struct posix_acl *acl, void *buffer, size_t size) { - posix_acl_xattr_header *ext_acl = (posix_acl_xattr_header *)buffer; -posix_acl_xattr_entry *ext_entry; + struct posix_acl_xattr_header *ext_acl = buffer; +struct posix_acl_xattr_entry *ext_entry;int real_size, n; real_size =posix_acl_xattr_size (acl->a_count);
@@ -770,7 +770,7 @@ posix_acl_to_xattr(struct user_namespace *user_ns, const struct posix_acl *acl,if (real_size > size)return -ERANGE ; - ext_entry = ext_acl->a_entries; + ext_entry = (void *)(ext_acl +1 ); ext_acl->a_version =cpu_to_le32 (POSIX_ACL_XATTR_VERSION );for (n=0 ; n < acl->a_count; n++, ext_entry++) {
include/linux/posix_acl_xattr.h +10 -11
@@ -18,34 +18,33 @@/* An undefined entry e_id value */ #define ACL_UNDEFINED_ID (-1) -typedef struct { +struct posix_acl_xattr_entry {__le16 e_tag;__le16 e_perm;__le32 e_id; -}posix_acl_xattr_entry ; +}; -typedef struct { +struct posix_acl_xattr_header {__le32 a_version; -posix_acl_xattr_entry a_entries[0 ]; -}posix_acl_xattr_header ; +};static inline size_t posix_acl_xattr_size (int count) { -return (sizeof (posix_acl_xattr_header) + - (count *sizeof (posix_acl_xattr_entry))); +return (sizeof (struct posix_acl_xattr_header ) + + (count *sizeof (struct posix_acl_xattr_entry ))); }static inline int posix_acl_xattr_count (size_t size) { -if (size <sizeof (posix_acl_xattr_header)) +if (size <sizeof (struct posix_acl_xattr_header ))return -1 ; - size -=sizeof (posix_acl_xattr_header); -if (size %sizeof (posix_acl_xattr_entry)) + size -=sizeof (struct posix_acl_xattr_header ); +if (size %sizeof (struct posix_acl_xattr_entry ))return -1 ; -return size /sizeof (posix_acl_xattr_entry); +return size /sizeof (struct posix_acl_xattr_entry ); }#ifdef CONFIG_FS_POSIX_ACL
Signature · 1 line
2.7.4
PATCH 2/2 posix_acl: uapi header split
Export the base definitions and the xattr representation of POSIX ACLs to user space.
Signed-off-by Andreas Gruenbacher <[email protected]>
--- include/linux/posix_acl.h | 22 +------------------- include/linux/posix_acl_xattr.h | 18 +---------------- include/uapi/linux/Kbuild | 2 ++ include/uapi/linux/posix_acl.h | 39 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/posix_acl_xattr.h | 38 +++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 38 deletions(-) create mode 100644 include/uapi/linux/posix_acl.h create mode 100644 include/uapi/linux/posix_acl_xattr.h
include/linux/posix_acl.h +1 -21
@@ -11,27 +11,7 @@#include <linux/bug.h> #include <linux/slab.h> #include <linux/rcupdate.h> - -#define ACL_UNDEFINED_ID (-1) - -/* a_type field in acl_user_posix_entry_t */ -#define ACL_TYPE_ACCESS (0x8000) -#define ACL_TYPE_DEFAULT (0x4000) - -/* e_tag entry in struct posix_acl_entry */ -#define ACL_USER_OBJ (0x01) -#define ACL_USER (0x02) -#define ACL_GROUP_OBJ (0x04) -#define ACL_GROUP (0x08) -#define ACL_MASK (0x10) -#define ACL_OTHER (0x20) - -/* permissions in the e_perm field */ -#define ACL_READ (0x04) -#define ACL_WRITE (0x02) -#define ACL_EXECUTE (0x01) -//#define ACL_ADD (0x08) -//#define ACL_DELETE (0x10) +#include <uapi/linux/posix_acl.h> struct posix_acl_entry {short e_tag;
include/linux/posix_acl_xattr.h +1 -17
@@ -10,25 +10,9 @@#define _POSIX_ACL_XATTR_H#include <uapi/linux/xattr.h> +#include <uapi/linux/posix_acl_xattr.h> #include <linux/posix_acl.h> -/* Supported ACL a_version fields */ -#define POSIX_ACL_XATTR_VERSION 0x0002 - -/* An undefined entry e_id value */ -#define ACL_UNDEFINED_ID (-1) - -struct posix_acl_xattr_entry { -__le16 e_tag; -__le16 e_perm; -__le32 e_id; -}; - -struct posix_acl_xattr_header { -__le32 a_version; -}; - -static inline size_t posix_acl_xattr_size (int count) {
include/uapi/linux/Kbuild +2 -0
@@ -335,6 +335,8 @@ header-y += pkt_cls.h header-y += pkt_sched.h header-y += pmu.h header-y += poll.h +header-y += posix_acl.h +header-y += posix_acl_xattr.h header-y += posix_types.h header-y += ppdev.h header-y += ppp-comp.h
include/uapi/linux/posix_acl.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* Copyright (C) 2002 Andreas Gruenbacher <[email protected]> +* Copyright (C) 2016 Red Hat, Inc. +* +* This file is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This file is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +*/ + +#ifndef __UAPI_POSIX_ACL_H +#define __UAPI_POSIX_ACL_H + +#define ACL_UNDEFINED_ID (-1) + +/* a_type field in acl_user_posix_entry_t */ +#define ACL_TYPE_ACCESS (0x8000) +#define ACL_TYPE_DEFAULT (0x4000) + +/* e_tag entry in struct posix_acl_entry */ +#define ACL_USER_OBJ (0x01) +#define ACL_USER (0x02) +#define ACL_GROUP_OBJ (0x04) +#define ACL_GROUP (0x08) +#define ACL_MASK (0x10) +#define ACL_OTHER (0x20) + +/* permissions in the e_perm field */ +#define ACL_READ (0x04) +#define ACL_WRITE (0x02) +#define ACL_EXECUTE (0x01) + +#endif /* __UAPI_POSIX_ACL_H */
include/uapi/linux/posix_acl_xattr.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright (C) 2002 Andreas Gruenbacher <[email protected]> +* Copyright (C) 2016 Red Hat, Inc. +* +* This file is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This file is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +*/ + +#ifndef __UAPI_POSIX_ACL_XATTR_H +#define __UAPI_POSIX_ACL_XATTR_H + +#include <linux/types.h> + +/* Supported ACL a_version fields */ +#define POSIX_ACL_XATTR_VERSION 0x0002 + +/* An undefined entry e_id value */ +#define ACL_UNDEFINED_ID (-1) + +struct posix_acl_xattr_entry { +__le16 e_tag; +__le16 e_perm; +__le32 e_id; +}; + +struct posix_acl_xattr_header { +__le32 a_version; +}; + +#endif /* __UAPI_POSIX_ACL_XATTR_H */
Signature · 1 line
2.7.4