History

posix_acl: uapi header split

Export the base definitions and the xattr representation of POSIX ACLs to user space.

Andreas Gruenbacher committed 10 years ago

Commit bc8bcf31 parent 2211d5b5 files · +81 −38Browse files

Unified · Split

5 files
  1. include/linux/posix_acl.h +1 −21
  2. include/linux/posix_acl_xattr.h +1 −17
  3. include/uapi/linux/Kbuild +2 −0
  4. include/uapi/linux/posix_acl.h +39 −0
  5. include/uapi/linux/posix_acl_xattr.h +38 −0
include/linux/posix_acl.h+1−21
@@ -11,27 +11,7 @@ · 10 unmodified lines
11#include <linux/bug.h>11#include <linux/bug.h>
12#include <linux/slab.h>12#include <linux/slab.h>
13#include <linux/rcupdate.h>13#include <linux/rcupdate.h>
14 14#include <uapi/linux/posix_acl.h>
15#define ACL_UNDEFINED_ID (-1)
16
17/* a_type field in acl_user_posix_entry_t */
18#define ACL_TYPE_ACCESS (0x8000)
19#define ACL_TYPE_DEFAULT (0x4000)
20
21/* e_tag entry in struct posix_acl_entry */
22#define ACL_USER_OBJ (0x01)
23#define ACL_USER (0x02)
24#define ACL_GROUP_OBJ (0x04)
25#define ACL_GROUP (0x08)
26#define ACL_MASK (0x10)
27#define ACL_OTHER (0x20)
28
29/* permissions in the e_perm field */
30#define ACL_READ (0x04)
31#define ACL_WRITE (0x02)
32#define ACL_EXECUTE (0x01)
33//#define ACL_ADD (0x08)
34//#define ACL_DELETE (0x10)
35 15
36struct posix_acl_entry {16struct posix_acl_entry {
37 short e_tag;17 short e_tag;
include/linux/posix_acl_xattr.h+1−17
@@ -10,25 +10,9 @@ · 9 unmodified lines
10#define _POSIX_ACL_XATTR_H10#define _POSIX_ACL_XATTR_H
11 11
12#include <uapi/linux/xattr.h>12#include <uapi/linux/xattr.h>
13#include <uapi/linux/posix_acl_xattr.h>
13#include <linux/posix_acl.h>14#include <linux/posix_acl.h>
14 15
15/* Supported ACL a_version fields */
16#define POSIX_ACL_XATTR_VERSION 0x0002
17
18/* An undefined entry e_id value */
19#define ACL_UNDEFINED_ID (-1)
20
21struct posix_acl_xattr_entry {
22 __le16 e_tag;
23 __le16 e_perm;
24 __le32 e_id;
25};
26
27struct posix_acl_xattr_header {
28 __le32 a_version;
29};
30
31
32static inline size_t16static inline size_t
33posix_acl_xattr_size(int count)17posix_acl_xattr_size(int count)
34{18{
include/uapi/linux/Kbuild+2−0
@@ -335,6 +335,8 @@ header-y += pkt_cls.h · 334 unmodified lines
335header-y += pkt_sched.h335header-y += pkt_sched.h
336header-y += pmu.h336header-y += pmu.h
337header-y += poll.h337header-y += poll.h
338header-y += posix_acl.h
339header-y += posix_acl_xattr.h
338header-y += posix_types.h340header-y += posix_types.h
339header-y += ppdev.h341header-y += ppdev.h
340header-y += ppp-comp.h342header-y += ppp-comp.h
include/uapi/linux/posix_acl.h+39−0
@@ -0,0 +1,39 @@
1/*
2 * Copyright (C) 2002 Andreas Gruenbacher <a.gruenbacher@computer.org>
3 * Copyright (C) 2016 Red Hat, Inc.
4 *
5 * This file is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version.
9 *
10 * This file is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Lesser General Public License for more details.
14 *
15 */
16
17#ifndef __UAPI_POSIX_ACL_H
18#define __UAPI_POSIX_ACL_H
19
20#define ACL_UNDEFINED_ID (-1)
21
22/* a_type field in acl_user_posix_entry_t */
23#define ACL_TYPE_ACCESS (0x8000)
24#define ACL_TYPE_DEFAULT (0x4000)
25
26/* e_tag entry in struct posix_acl_entry */
27#define ACL_USER_OBJ (0x01)
28#define ACL_USER (0x02)
29#define ACL_GROUP_OBJ (0x04)
30#define ACL_GROUP (0x08)
31#define ACL_MASK (0x10)
32#define ACL_OTHER (0x20)
33
34/* permissions in the e_perm field */
35#define ACL_READ (0x04)
36#define ACL_WRITE (0x02)
37#define ACL_EXECUTE (0x01)
38
39#endif /* __UAPI_POSIX_ACL_H */
include/uapi/linux/posix_acl_xattr.h+38−0
@@ -0,0 +1,38 @@
1/*
2 * Copyright (C) 2002 Andreas Gruenbacher <a.gruenbacher@computer.org>
3 * Copyright (C) 2016 Red Hat, Inc.
4 *
5 * This file is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version.
9 *
10 * This file is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Lesser General Public License for more details.
14 *
15 */
16
17#ifndef __UAPI_POSIX_ACL_XATTR_H
18#define __UAPI_POSIX_ACL_XATTR_H
19
20#include <linux/types.h>
21
22/* Supported ACL a_version fields */
23#define POSIX_ACL_XATTR_VERSION 0x0002
24
25/* An undefined entry e_id value */
26#define ACL_UNDEFINED_ID (-1)
27
28struct posix_acl_xattr_entry {
29 __le16 e_tag;
30 __le16 e_perm;
31 __le32 e_id;
32};
33
34struct posix_acl_xattr_header {
35 __le32 a_version;
36};
37
38#endif /* __UAPI_POSIX_ACL_XATTR_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t