Pull misc vfs updates from Al Viro: "Assorted misc bits and pieces. There are several single-topic branches left after this (rename2 series from Miklos, current_time series from Deepa Dinamani, xattr series from Andreas, uaccess stuff from from me) and I'd prefer to send those separately" * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (39 commits) proc: switch auxv to use of __mem_open() hpfs: support FIEMAP cifs: get rid of unused arguments of CIFSSMBWrite() posix_acl: uapi header split posix_acl: xattr representation cleanups fs/aio.c: eliminate redundant loads in put_aio_ring_file fs/internal.h: add const to ns_dentry_operations declaration compat: remove compat_printk() fs/buffer.c: make __getblk_slow() static proc: unsigned file descriptors fs/file: more unsigned file descriptors fs: compat: remove redundant check of nr_segs cachefiles: Fix attempt to read i_blocks after deleting file [ver #2] cifs: don't use memcpy() to copy struct iov_iter get rid of separate multipage fault-in primitives fs: Avoid premature clearing of capabilities fs: Give dentry to inode_change_ok() instead of inode fuse: Propagate dentry down to inode_change_ok() ceph: Propagate dentry down to inode_change_ok() xfs: Propagate dentry down to inode_change_ok() ...
Showing the changes to include/uapi/linux (4 of 136 files). Show all
Unified · Split
| @@ -336,6 +336,8 @@ header-y += pkt_cls.h · 335 unmodified lines | ||
| 336 | 336 | header-y += pkt_sched.h |
| 337 | 337 | header-y += pmu.h |
| 338 | 338 | header-y += poll.h |
| 339 | +header-y += posix_acl.h | |
| 340 | +header-y += posix_acl_xattr.h | |
| 339 | 341 | header-y += posix_types.h |
| 340 | 342 | header-y += ppdev.h |
| 341 | 343 | header-y += ppp-comp.h |
| @@ -132,6 +132,7 @@ struct inodes_stat_t { · 131 unmodified lines | ||
| 132 | 132 | #define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */ |
| 133 | 133 | |
| 134 | 134 | /* These sb flags are internal to the kernel */ |
| 135 | +#define MS_NOREMOTELOCK (1<<27) | |
| 135 | 136 | #define MS_NOSEC (1<<28) |
| 136 | 137 | #define MS_BORN (1<<29) |
| 137 | 138 | #define MS_ACTIVE (1<<30) |
| @@ -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 */ | |
| @@ -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 | + | |
| 28 | +struct posix_acl_xattr_entry { | |
| 29 | + __le16 e_tag; | |
| 30 | + __le16 e_perm; | |
| 31 | + __le32 e_id; | |
| 32 | +}; | |
| 33 | + | |
| 34 | +struct posix_acl_xattr_header { | |
| 35 | + __le32 a_version; | |
| 36 | +}; | |
| 37 | + | |
| 38 | +#endif /* __UAPI_POSIX_ACL_XATTR_H */ | |