Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs updates from Al Viro:
 "Assorted stuff; the biggest pile here is Christoph's ACL series.  Plus
  assorted cleanups and fixes all over the place...

  There will be another pile later this week"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (43 commits)
  __dentry_path() fixes
  vfs: Remove second variable named error in __dentry_path
  vfs: Is mounted should be testing mnt_ns for NULL or error.
  Fix race when checking i_size on direct i/o read
  hfsplus: remove can_set_xattr
  nfsd: use get_acl and ->set_acl
  fs: remove generic_acl
  nfs: use generic posix ACL infrastructure for v3 Posix ACLs
  gfs2: use generic posix ACL infrastructure
  jfs: use generic posix ACL infrastructure
  xfs: use generic posix ACL infrastructure
  reiserfs: use generic posix ACL infrastructure
  ocfs2: use generic posix ACL infrastructure
  jffs2: use generic posix ACL infrastructure
  hfsplus: use generic posix ACL infrastructure
  f2fs: use generic posix ACL infrastructure
  ext2/3/4: use generic posix ACL infrastructure
  btrfs: use generic posix ACL infrastructure
  fs: make posix_acl_create more useful
  fs: make posix_acl_chmod more useful
  ...

6 files changed, 29 insertions, 246 deletions

diff --git a/fs/hfsplus/acl.h b/fs/hfsplus/acl.h
index 07c0d4947527..95c8ed9ec17f 100644
--- a/fs/hfsplus/acl.h
+++ b/fs/hfsplus/acl.h
@@ -12,16 +12,13 @@
 
 /* posix_acl.c */
 struct posix_acl *hfsplus_get_posix_acl(struct inode *inode, int type);
-extern int hfsplus_posix_acl_chmod(struct inode *);
+int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl,
+                int type);
 extern int hfsplus_init_posix_acl(struct inode *, struct inode *);
 
 #else  /* CONFIG_HFSPLUS_FS_POSIX_ACL */
 #define hfsplus_get_posix_acl NULL
-
-static inline int hfsplus_posix_acl_chmod(struct inode *inode)
-{
-        return 0;
-}
+#define hfsplus_set_posix_acl NULL
 
 static inline int hfsplus_init_posix_acl(struct inode *inode, struct inode *dir)
 {
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index 4a4fea002673..9ee62985e739 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -532,6 +532,7 @@ const struct inode_operations hfsplus_dir_inode_operations = {
         .removexattr            = hfsplus_removexattr,
 #ifdef CONFIG_HFSPLUS_FS_POSIX_ACL
         .get_acl                = hfsplus_get_posix_acl,
+        .set_acl                = hfsplus_set_posix_acl,
 #endif
 };
 
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index 3ebda928229c..4551cbd6bd43 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -261,7 +261,7 @@ static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr)
         mark_inode_dirty(inode);
 
         if (attr->ia_valid & ATTR_MODE) {
-                error = hfsplus_posix_acl_chmod(inode);
+                error = posix_acl_chmod(inode, inode->i_mode);
                 if (unlikely(error))
                         return error;
         }
@@ -334,6 +334,7 @@ static const struct inode_operations hfsplus_file_inode_operations = {
         .removexattr    = hfsplus_removexattr,
 #ifdef CONFIG_HFSPLUS_FS_POSIX_ACL
         .get_acl        = hfsplus_get_posix_acl,
+        .set_acl        = hfsplus_set_posix_acl,
 #endif
 };
 
diff --git a/fs/hfsplus/posix_acl.c b/fs/hfsplus/posix_acl.c
index b609cc14c72e..df0c9af68d05 100644
--- a/fs/hfsplus/posix_acl.c
+++ b/fs/hfsplus/posix_acl.c
@@ -17,9 +17,7 @@ struct posix_acl *hfsplus_get_posix_acl(struct inode *inode, int type)
         char *value = NULL;
         ssize_t size;
 
-        acl = get_cached_acl(inode, type);
-        if (acl != ACL_NOT_CACHED)
-                return acl;
+        hfs_dbg(ACL_MOD, "[%s]: ino %lu\n", __func__, inode->i_ino);
 
         switch (type) {
         case ACL_TYPE_ACCESS:
@@ -56,17 +54,15 @@ struct posix_acl *hfsplus_get_posix_acl(struct inode *inode, int type)
         return acl;
 }
 
-static int hfsplus_set_posix_acl(struct inode *inode,
-                                        int type,
-                                        struct posix_acl *acl)
+int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl,
+                int type)
 {
         int err;
         char *xattr_name;
         size_t size = 0;
         char *value = NULL;
 
-        if (S_ISLNK(inode->i_mode))
-                return -EOPNOTSUPP;
+        hfs_dbg(ACL_MOD, "[%s]: ino %lu\n", __func__, inode->i_ino);
 
         switch (type) {
         case ACL_TYPE_ACCESS:
@@ -115,7 +111,7 @@ end_set_acl:
 int hfsplus_init_posix_acl(struct inode *inode, struct inode *dir)
 {
         int err = 0;
-        struct posix_acl *acl = NULL;
+        struct posix_acl *default_acl, *acl;
 
         hfs_dbg(ACL_MOD,
                 "[%s]: ino %lu, dir->ino %lu\n",
@@ -124,151 +120,21 @@ int hfsplus_init_posix_acl(struct inode *inode, struct inode *dir)
         if (S_ISLNK(inode->i_mode))
                 return 0;
 
-        acl = hfsplus_get_posix_acl(dir, ACL_TYPE_DEFAULT);
-        if (IS_ERR(acl))
-                return PTR_ERR(acl);
-
-        if (acl) {
-                if (S_ISDIR(inode->i_mode)) {
-                        err = hfsplus_set_posix_acl(inode,
-                                                        ACL_TYPE_DEFAULT,
-                                                        acl);
-                        if (unlikely(err))
-                                goto init_acl_cleanup;
-                }
-
-                err = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
-                if (unlikely(err < 0))
-                        return err;
-
-                if (err > 0)
-                        err = hfsplus_set_posix_acl(inode,
-                                                        ACL_TYPE_ACCESS,
-                                                        acl);
-        } else
-                inode->i_mode &= ~current_umask();
-
-init_acl_cleanup:
-        posix_acl_release(acl);
-        return err;
-}
-
-int hfsplus_posix_acl_chmod(struct inode *inode)
-{
-        int err;
-        struct posix_acl *acl;
-
-        hfs_dbg(ACL_MOD, "[%s]: ino %lu\n", __func__, inode->i_ino);
-
-        if (S_ISLNK(inode->i_mode))
-                return -EOPNOTSUPP;
-
-        acl = hfsplus_get_posix_acl(inode, ACL_TYPE_ACCESS);
-        if (IS_ERR(acl) || !acl)
-                return PTR_ERR(acl);
-
-        err = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
-        if (unlikely(err))
+        err = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
+        if (err)
                 return err;
 
-        err = hfsplus_set_posix_acl(inode, ACL_TYPE_ACCESS, acl);
-        posix_acl_release(acl);
-        return err;
-}
-
-static int hfsplus_xattr_get_posix_acl(struct dentry *dentry,
-                                        const char *name,
-                                        void *buffer,
-                                        size_t size,
-                                        int type)
-{
-        int err = 0;
-        struct posix_acl *acl;
-
-        hfs_dbg(ACL_MOD,
-                "[%s]: ino %lu, buffer %p, size %zu, type %#x\n",
-                __func__, dentry->d_inode->i_ino, buffer, size, type);
-
-        if (strcmp(name, "") != 0)
-                return -EINVAL;
-
-        acl = hfsplus_get_posix_acl(dentry->d_inode, type);
-        if (IS_ERR(acl))
-                return PTR_ERR(acl);
-        if (acl == NULL)
-                return -ENODATA;
-
-        err = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);
-        posix_acl_release(acl);
-
-        return err;
-}
-
-static int hfsplus_xattr_set_posix_acl(struct dentry *dentry,
-                                        const char *name,
-                                        const void *value,
-                                        size_t size,
-                                        int flags,
-                                        int type)
-{
-        int err = 0;
-        struct inode *inode = dentry->d_inode;
-        struct posix_acl *acl = NULL;
-
-        hfs_dbg(ACL_MOD,
-                "[%s]: ino %lu, value %p, size %zu, flags %#x, type %#x\n",
-                __func__, inode->i_ino, value, size, flags, type);
-
-        if (strcmp(name, "") != 0)
-                return -EINVAL;
-
-        if (!inode_owner_or_capable(inode))
-                return -EPERM;
-
-        if (value) {
-                acl = posix_acl_from_xattr(&init_user_ns, value, size);
-                if (IS_ERR(acl))
-                        return PTR_ERR(acl);
-                else if (acl) {
-                        err = posix_acl_valid(acl);
-                        if (err)
-                                goto end_xattr_set_acl;
-                }
+        if (default_acl) {
+                err = hfsplus_set_posix_acl(inode, default_acl,
+                                            ACL_TYPE_DEFAULT);
+                posix_acl_release(default_acl);
         }
 
-        err = hfsplus_set_posix_acl(inode, type, acl);
-
-end_xattr_set_acl:
-        posix_acl_release(acl);
+        if (acl) {
+                if (!err)
+                        err = hfsplus_set_posix_acl(inode, acl,
+                                                    ACL_TYPE_ACCESS);
+                posix_acl_release(acl);
+        }
         return err;
 }
-
-static size_t hfsplus_xattr_list_posix_acl(struct dentry *dentry,
-                                                char *list,
-                                                size_t list_size,
-                                                const char *name,
-                                                size_t name_len,
-                                                int type)
-{
-        /*
-         * This method is not used.
-         * It is used hfsplus_listxattr() instead of generic_listxattr().
-         */
-        return -EOPNOTSUPP;
-}
-
-const struct xattr_handler hfsplus_xattr_acl_access_handler = {
-        .prefix = POSIX_ACL_XATTR_ACCESS,
-        .flags  = ACL_TYPE_ACCESS,
-        .list   = hfsplus_xattr_list_posix_acl,
-        .get    = hfsplus_xattr_get_posix_acl,
-        .set    = hfsplus_xattr_set_posix_acl,
-};
-
-const struct xattr_handler hfsplus_xattr_acl_default_handler = {
-        .prefix = POSIX_ACL_XATTR_DEFAULT,
-        .flags  = ACL_TYPE_DEFAULT,
-        .list   = hfsplus_xattr_list_posix_acl,
-        .get    = hfsplus_xattr_get_posix_acl,
-        .set    = hfsplus_xattr_set_posix_acl,
-};
diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c
index 3c6136f98c73..0b4a5c9b93c4 100644
--- a/fs/hfsplus/xattr.c
+++ b/fs/hfsplus/xattr.c
@@ -7,6 +7,7 @@
  */
 
 #include "hfsplus_fs.h"
+#include <linux/posix_acl_xattr.h>
 #include "xattr.h"
 #include "acl.h"
 
@@ -15,8 +16,8 @@ const struct xattr_handler *hfsplus_xattr_handlers[] = {
         &hfsplus_xattr_user_handler,
         &hfsplus_xattr_trusted_handler,
 #ifdef CONFIG_HFSPLUS_FS_POSIX_ACL
-        &hfsplus_xattr_acl_access_handler,
-        &hfsplus_xattr_acl_default_handler,
+        &posix_acl_access_xattr_handler,
+        &posix_acl_default_xattr_handler,
 #endif
         &hfsplus_xattr_security_handler,
         NULL
@@ -51,82 +52,6 @@ static inline int is_known_namespace(const char *name)
         return true;
 }
 
-static int can_set_system_xattr(struct inode *inode, const char *name,
-                                const void *value, size_t size)
-{
-#ifdef CONFIG_HFSPLUS_FS_POSIX_ACL
-        struct posix_acl *acl;
-        int err;
-
-        if (!inode_owner_or_capable(inode))
-                return -EPERM;
-
-        /*
-         * POSIX_ACL_XATTR_ACCESS is tied to i_mode
-         */
-        if (strcmp(name, POSIX_ACL_XATTR_ACCESS) == 0) {
-                acl = posix_acl_from_xattr(&init_user_ns, value, size);
-                if (IS_ERR(acl))
-                        return PTR_ERR(acl);
-                if (acl) {
-                        err = posix_acl_equiv_mode(acl, &inode->i_mode);
-                        posix_acl_release(acl);
-                        if (err < 0)
-                                return err;
-                        mark_inode_dirty(inode);
-                }
-                /*
-                 * We're changing the ACL.  Get rid of the cached one
-                 */
-                forget_cached_acl(inode, ACL_TYPE_ACCESS);
-
-                return 0;
-        } else if (strcmp(name, POSIX_ACL_XATTR_DEFAULT) == 0) {
-                acl = posix_acl_from_xattr(&init_user_ns, value, size);
-                if (IS_ERR(acl))
-                        return PTR_ERR(acl);
-                posix_acl_release(acl);
-
-                /*
-                 * We're changing the default ACL.  Get rid of the cached one
-                 */
-                forget_cached_acl(inode, ACL_TYPE_DEFAULT);
-
-                return 0;
-        }
-#endif /* CONFIG_HFSPLUS_FS_POSIX_ACL */
-        return -EOPNOTSUPP;
-}
-
-static int can_set_xattr(struct inode *inode, const char *name,
-                                const void *value, size_t value_len)
-{
-        if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
-                return can_set_system_xattr(inode, name, value, value_len);
-
-        if (!strncmp(name, XATTR_MAC_OSX_PREFIX, XATTR_MAC_OSX_PREFIX_LEN)) {
-                /*
-                 * This makes sure that we aren't trying to set an
-                 * attribute in a different namespace by prefixing it
-                 * with "osx."
-                 */
-                if (is_known_namespace(name + XATTR_MAC_OSX_PREFIX_LEN))
-                        return -EOPNOTSUPP;
-
-                return 0;
-        }
-
-        /*
-         * Don't allow setting an attribute in an unknown namespace.
-         */
-        if (strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN) &&
-            strncmp(name, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN) &&
-            strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))
-                return -EOPNOTSUPP;
-
-        return 0;
-}
-
 static void hfsplus_init_header_node(struct inode *attr_file,
                                         u32 clump_size,
                                         char *buf, u16 node_size)
@@ -349,10 +274,6 @@ int __hfsplus_setxattr(struct inode *inode, const char *name,
                                 HFSPLUS_IS_RSRC(inode))
                 return -EOPNOTSUPP;
 
-        err = can_set_xattr(inode, name, value, size);
-        if (err)
-                return err;
-
         if (strncmp(name, XATTR_MAC_OSX_PREFIX,
                                 XATTR_MAC_OSX_PREFIX_LEN) == 0)
                 name += XATTR_MAC_OSX_PREFIX_LEN;
@@ -840,10 +761,6 @@ int hfsplus_removexattr(struct dentry *dentry, const char *name)
         if (!HFSPLUS_SB(inode->i_sb)->attr_tree)
                 return -EOPNOTSUPP;
 
-        err = can_set_xattr(inode, name, NULL, 0);
-        if (err)
-                return err;
-
         if (strncmp(name, XATTR_MAC_OSX_PREFIX,
                                 XATTR_MAC_OSX_PREFIX_LEN) == 0)
                 name += XATTR_MAC_OSX_PREFIX_LEN;
@@ -940,6 +857,9 @@ static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
         if (len > HFSPLUS_ATTR_MAX_STRLEN)
                 return -EOPNOTSUPP;
 
+        if (is_known_namespace(name))
+                return -EOPNOTSUPP;
+
         strcpy(xattr_name, XATTR_MAC_OSX_PREFIX);
         strcpy(xattr_name + XATTR_MAC_OSX_PREFIX_LEN, name);
 
diff --git a/fs/hfsplus/xattr.h b/fs/hfsplus/xattr.h
index 841b5698c0fc..9e214490c313 100644
--- a/fs/hfsplus/xattr.h
+++ b/fs/hfsplus/xattr.h
@@ -14,8 +14,6 @@
 extern const struct xattr_handler hfsplus_xattr_osx_handler;
 extern const struct xattr_handler hfsplus_xattr_user_handler;
 extern const struct xattr_handler hfsplus_xattr_trusted_handler;
-extern const struct xattr_handler hfsplus_xattr_acl_access_handler;
-extern const struct xattr_handler hfsplus_xattr_acl_default_handler;
 extern const struct xattr_handler hfsplus_xattr_security_handler;
 
 extern const struct xattr_handler *hfsplus_xattr_handlers[];