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
  ...

7 files changed, 39 insertions, 208 deletions

diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index dbb5ad59a7fc..8bbaf5bcf982 100644
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -145,13 +145,6 @@ ext3_get_acl(struct inode *inode, int type)
         struct posix_acl *acl;
         int retval;
 
-        if (!test_opt(inode->i_sb, POSIX_ACL))
-                return NULL;
-
-        acl = get_cached_acl(inode, type);
-        if (acl != ACL_NOT_CACHED)
-                return acl;
-
         switch (type) {
         case ACL_TYPE_ACCESS:
                 name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS;
@@ -190,7 +183,7 @@ ext3_get_acl(struct inode *inode, int type)
  * inode->i_mutex: down unless called from ext3_new_inode
  */
 static int
-ext3_set_acl(handle_t *handle, struct inode *inode, int type,
+__ext3_set_acl(handle_t *handle, struct inode *inode, int type,
              struct posix_acl *acl)
 {
         int name_index;
@@ -198,9 +191,6 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type,
         size_t size = 0;
         int error;
 
-        if (S_ISLNK(inode->i_mode))
-                return -EOPNOTSUPP;
-
         switch(type) {
                 case ACL_TYPE_ACCESS:
                         name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS;
@@ -243,204 +233,49 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type,
         return error;
 }
 
-/*
- * Initialize the ACLs of a new inode. Called from ext3_new_inode.
- *
- * dir->i_mutex: down
- * inode->i_mutex: up (access to inode is still exclusive)
- */
 int
-ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
+ext3_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 {
-        struct posix_acl *acl = NULL;
-        int error = 0;
-
-        if (!S_ISLNK(inode->i_mode)) {
-                if (test_opt(dir->i_sb, POSIX_ACL)) {
-                        acl = ext3_get_acl(dir, ACL_TYPE_DEFAULT);
-                        if (IS_ERR(acl))
-                                return PTR_ERR(acl);
-                }
-                if (!acl)
-                        inode->i_mode &= ~current_umask();
-        }
-        if (test_opt(inode->i_sb, POSIX_ACL) && acl) {
-                if (S_ISDIR(inode->i_mode)) {
-                        error = ext3_set_acl(handle, inode,
-                                             ACL_TYPE_DEFAULT, acl);
-                        if (error)
-                                goto cleanup;
-                }
-                error = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
-                if (error < 0)
-                        return error;
-
-                if (error > 0) {
-                        /* This is an extended ACL */
-                        error = ext3_set_acl(handle, inode, ACL_TYPE_ACCESS, acl);
-                }
-        }
-cleanup:
-        posix_acl_release(acl);
-        return error;
-}
-
-/*
- * Does chmod for an inode that may have an Access Control List. The
- * inode->i_mode field must be updated to the desired value by the caller
- * before calling this function.
- * Returns 0 on success, or a negative error number.
- *
- * We change the ACL rather than storing some ACL entries in the file
- * mode permission bits (which would be more efficient), because that
- * would break once additional permissions (like  ACL_APPEND, ACL_DELETE
- * for directories) are added. There are no more bits available in the
- * file mode.
- *
- * inode->i_mutex: down
- */
-int
-ext3_acl_chmod(struct inode *inode)
-{
-        struct posix_acl *acl;
         handle_t *handle;
-        int retries = 0;
-        int error;
+        int error, retries = 0;
 
-        if (S_ISLNK(inode->i_mode))
-                return -EOPNOTSUPP;
-        if (!test_opt(inode->i_sb, POSIX_ACL))
-                return 0;
-        acl = ext3_get_acl(inode, ACL_TYPE_ACCESS);
-        if (IS_ERR(acl) || !acl)
-                return PTR_ERR(acl);
-        error = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
-        if (error)
-                return error;
 retry:
-        handle = ext3_journal_start(inode,
-                        EXT3_DATA_TRANS_BLOCKS(inode->i_sb));
-        if (IS_ERR(handle)) {
-                error = PTR_ERR(handle);
-                ext3_std_error(inode->i_sb, error);
-                goto out;
-        }
-        error = ext3_set_acl(handle, inode, ACL_TYPE_ACCESS, acl);
+        handle = ext3_journal_start(inode, EXT3_DATA_TRANS_BLOCKS(inode->i_sb));
+        if (IS_ERR(handle))
+                return PTR_ERR(handle);
+        error = __ext3_set_acl(handle, inode, type, acl);
         ext3_journal_stop(handle);
-        if (error == -ENOSPC &&
-            ext3_should_retry_alloc(inode->i_sb, &retries))
+        if (error == -ENOSPC && ext3_should_retry_alloc(inode->i_sb, &retries))
                 goto retry;
-out:
-        posix_acl_release(acl);
         return error;
 }
 
 /*
- * Extended attribute handlers
+ * Initialize the ACLs of a new inode. Called from ext3_new_inode.
+ *
+ * dir->i_mutex: down
+ * inode->i_mutex: up (access to inode is still exclusive)
  */
-static size_t
-ext3_xattr_list_acl_access(struct dentry *dentry, char *list, size_t list_len,
-                           const char *name, size_t name_len, int type)
-{
-        const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);
-
-        if (!test_opt(dentry->d_sb, POSIX_ACL))
-                return 0;
-        if (list && size <= list_len)
-                memcpy(list, POSIX_ACL_XATTR_ACCESS, size);
-        return size;
-}
-
-static size_t
-ext3_xattr_list_acl_default(struct dentry *dentry, char *list, size_t list_len,
-                            const char *name, size_t name_len, int type)
-{
-        const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);
-
-        if (!test_opt(dentry->d_sb, POSIX_ACL))
-                return 0;
-        if (list && size <= list_len)
-                memcpy(list, POSIX_ACL_XATTR_DEFAULT, size);
-        return size;
-}
-
-static int
-ext3_xattr_get_acl(struct dentry *dentry, const char *name, void *buffer,
-                   size_t size, int type)
+int
+ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
 {
-        struct posix_acl *acl;
+        struct posix_acl *default_acl, *acl;
         int error;
 
-        if (strcmp(name, "") != 0)
-                return -EINVAL;
-        if (!test_opt(dentry->d_sb, POSIX_ACL))
-                return -EOPNOTSUPP;
-
-        acl = ext3_get_acl(dentry->d_inode, type);
-        if (IS_ERR(acl))
-                return PTR_ERR(acl);
-        if (acl == NULL)
-                return -ENODATA;
-        error = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);
-        posix_acl_release(acl);
-
-        return error;
-}
-
-static int
-ext3_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,
-                   size_t size, int flags, int type)
-{
-        struct inode *inode = dentry->d_inode;
-        handle_t *handle;
-        struct posix_acl *acl;
-        int error, retries = 0;
-
-        if (strcmp(name, "") != 0)
-                return -EINVAL;
-        if (!test_opt(inode->i_sb, POSIX_ACL))
-                return -EOPNOTSUPP;
-        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) {
-                        error = posix_acl_valid(acl);
-                        if (error)
-                                goto release_and_out;
-                }
-        } else
-                acl = NULL;
-
-retry:
-        handle = ext3_journal_start(inode, EXT3_DATA_TRANS_BLOCKS(inode->i_sb));
-        if (IS_ERR(handle))
-                return PTR_ERR(handle);
-        error = ext3_set_acl(handle, inode, type, acl);
-        ext3_journal_stop(handle);
-        if (error == -ENOSPC && ext3_should_retry_alloc(inode->i_sb, &retries))
-                goto retry;
+        error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
+        if (error)
+                return error;
 
-release_and_out:
-        posix_acl_release(acl);
+        if (default_acl) {
+                error = __ext3_set_acl(handle, inode, ACL_TYPE_DEFAULT,
+                                       default_acl);
+                posix_acl_release(default_acl);
+        }
+        if (acl) {
+                if (!error)
+                        error = __ext3_set_acl(handle, inode, ACL_TYPE_ACCESS,
+                                               acl);
+                posix_acl_release(acl);
+        }
         return error;
 }
-
-const struct xattr_handler ext3_xattr_acl_access_handler = {
-        .prefix = POSIX_ACL_XATTR_ACCESS,
-        .flags  = ACL_TYPE_ACCESS,
-        .list   = ext3_xattr_list_acl_access,
-        .get    = ext3_xattr_get_acl,
-        .set    = ext3_xattr_set_acl,
-};
-
-const struct xattr_handler ext3_xattr_acl_default_handler = {
-        .prefix = POSIX_ACL_XATTR_DEFAULT,
-        .flags  = ACL_TYPE_DEFAULT,
-        .list   = ext3_xattr_list_acl_default,
-        .get    = ext3_xattr_get_acl,
-        .set    = ext3_xattr_set_acl,
-};
diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index dbc921e458c5..ea1c69edab9e 100644
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -55,18 +55,13 @@ static inline int ext3_acl_count(size_t size)
 
 /* acl.c */
 extern struct posix_acl *ext3_get_acl(struct inode *inode, int type);
-extern int ext3_acl_chmod (struct inode *);
+extern int ext3_set_acl(struct inode *inode, struct posix_acl *acl, int type);
 extern int ext3_init_acl (handle_t *, struct inode *, struct inode *);
 
 #else  /* CONFIG_EXT3_FS_POSIX_ACL */
 #include <linux/sched.h>
 #define ext3_get_acl NULL
-
-static inline int
-ext3_acl_chmod(struct inode *inode)
-{
-        return 0;
-}
+#define ext3_set_acl NULL
 
 static inline int
 ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
diff --git a/fs/ext3/file.c b/fs/ext3/file.c
index 25cb413277e9..aad05311392a 100644
--- a/fs/ext3/file.c
+++ b/fs/ext3/file.c
@@ -75,6 +75,7 @@ const struct inode_operations ext3_file_inode_operations = {
         .removexattr    = generic_removexattr,
 #endif
         .get_acl        = ext3_get_acl,
+        .set_acl        = ext3_set_acl,
         .fiemap         = ext3_fiemap,
 };
 
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 2bd85486b879..384b6ebb655f 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -3365,7 +3365,7 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr)
         mark_inode_dirty(inode);
 
         if (ia_valid & ATTR_MODE)
-                rc = ext3_acl_chmod(inode);
+                rc = posix_acl_chmod(inode, inode->i_mode);
 
 err_out:
         ext3_std_error(inode->i_sb, error);
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index f8cde46de9cd..f197736dccfa 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -2569,6 +2569,7 @@ const struct inode_operations ext3_dir_inode_operations = {
         .removexattr    = generic_removexattr,
 #endif
         .get_acl        = ext3_get_acl,
+        .set_acl        = ext3_set_acl,
 };
 
 const struct inode_operations ext3_special_inode_operations = {
@@ -2580,4 +2581,5 @@ const struct inode_operations ext3_special_inode_operations = {
         .removexattr    = generic_removexattr,
 #endif
         .get_acl        = ext3_get_acl,
+        .set_acl        = ext3_set_acl,
 };
diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
index b1fc96383e08..c6874be6d58b 100644
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
@@ -102,8 +102,8 @@ static struct mb_cache *ext3_xattr_cache;
 static const struct xattr_handler *ext3_xattr_handler_map[] = {
         [EXT3_XATTR_INDEX_USER]              = &ext3_xattr_user_handler,
 #ifdef CONFIG_EXT3_FS_POSIX_ACL
-        [EXT3_XATTR_INDEX_POSIX_ACL_ACCESS]  = &ext3_xattr_acl_access_handler,
-        [EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT] = &ext3_xattr_acl_default_handler,
+        [EXT3_XATTR_INDEX_POSIX_ACL_ACCESS]  = &posix_acl_access_xattr_handler,
+        [EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT] = &posix_acl_default_xattr_handler,
 #endif
         [EXT3_XATTR_INDEX_TRUSTED]           = &ext3_xattr_trusted_handler,
 #ifdef CONFIG_EXT3_FS_SECURITY
@@ -115,8 +115,8 @@ const struct xattr_handler *ext3_xattr_handlers[] = {
         &ext3_xattr_user_handler,
         &ext3_xattr_trusted_handler,
 #ifdef CONFIG_EXT3_FS_POSIX_ACL
-        &ext3_xattr_acl_access_handler,
-        &ext3_xattr_acl_default_handler,
+        &posix_acl_access_xattr_handler,
+        &posix_acl_default_xattr_handler,
 #endif
 #ifdef CONFIG_EXT3_FS_SECURITY
         &ext3_xattr_security_handler,
diff --git a/fs/ext3/xattr.h b/fs/ext3/xattr.h
index 2be4f69bfa64..32e93ebf8031 100644
--- a/fs/ext3/xattr.h
+++ b/fs/ext3/xattr.h
@@ -60,8 +60,6 @@ struct ext3_xattr_entry {
 
 extern const struct xattr_handler ext3_xattr_user_handler;
 extern const struct xattr_handler ext3_xattr_trusted_handler;
-extern const struct xattr_handler ext3_xattr_acl_access_handler;
-extern const struct xattr_handler ext3_xattr_acl_default_handler;
 extern const struct xattr_handler ext3_xattr_security_handler;
 
 extern ssize_t ext3_listxattr(struct dentry *, char *, size_t);