Merge branch 'fs.acl.rework' into for-next

diff --cc fs/internal.h
index 5545c26d86ae54d5ad5d5bce18dd3c616500e10b,e377eb7bbe7f2f1554b2d43555a73fe7cdccdda1..0c8812fe7ca465c2e8c11befabbfa90b6b598f7e
--- 1/fs/internal.h
--- 2/fs/internal.h
+++ b/fs/internal.h
@@@ -234,11 -232,26 +234,32 @@@ ssize_t do_getxattr(struct user_namespa
  int setxattr_copy(const char __user *name, struct xattr_ctx *ctx);
  int do_setxattr(struct user_namespace *mnt_userns, struct dentry *dentry,
                struct xattr_ctx *ctx);
+ int may_write_xattr(struct user_namespace *mnt_userns, struct inode *inode);
+ 
+ #ifdef CONFIG_FS_POSIX_ACL
+ int do_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry,
+              const char *acl_name, const void *kvalue, size_t size);
+ ssize_t do_get_acl(struct user_namespace *mnt_userns, struct dentry *dentry,
+                  const char *acl_name, void *kvalue, size_t size);
+ #else
+ static inline int do_set_acl(struct user_namespace *mnt_userns,
+                            struct dentry *dentry, const char *acl_name,
+                            const void *kvalue, size_t size)
+ {
+       return -EOPNOTSUPP;
+ }
+ static inline ssize_t do_get_acl(struct user_namespace *mnt_userns,
+                                struct dentry *dentry, const char *acl_name,
+                                void *kvalue, size_t size)
+ {
+       return -EOPNOTSUPP;
+ }
+ #endif
  
  ssize_t __kernel_write_iter(struct file *file, struct iov_iter *from, loff_t *pos);
 +
 +/*
 + * fs/attr.c
 + */
 +int setattr_should_drop_sgid(struct user_namespace *mnt_userns,
 +                           const struct inode *inode);

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc include/linux/fs.h
Simple merge