Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
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() ...
This commit is contained in:
@@ -336,6 +336,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
|
||||
|
@@ -132,6 +132,7 @@ struct inodes_stat_t {
|
||||
#define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */
|
||||
|
||||
/* These sb flags are internal to the kernel */
|
||||
#define MS_NOREMOTELOCK (1<<27)
|
||||
#define MS_NOSEC (1<<28)
|
||||
#define MS_BORN (1<<29)
|
||||
#define MS_ACTIVE (1<<30)
|
||||
|
39
include/uapi/linux/posix_acl.h
Normal file
39
include/uapi/linux/posix_acl.h
Normal file
@@ -0,0 +1,39 @@
|
||||
/*
|
||||
* Copyright (C) 2002 Andreas Gruenbacher <a.gruenbacher@computer.org>
|
||||
* 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 */
|
38
include/uapi/linux/posix_acl_xattr.h
Normal file
38
include/uapi/linux/posix_acl_xattr.h
Normal file
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
* Copyright (C) 2002 Andreas Gruenbacher <a.gruenbacher@computer.org>
|
||||
* 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 */
|
Reference in New Issue
Block a user