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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  fs: take the ACL checks to common code
  bury posix_acl_..._masq() variants
  kill boilerplates around posix_acl_create_masq()
  generic_acl: no need to clone acl just to push it to set_cached_acl()
  kill boilerplate around posix_acl_chmod_masq()
  reiserfs: cache negative ACLs for v1 stat format
  xfs: cache negative ACLs if there is no attribute fork
  9p: do no return 0 from ->check_acl without actually checking
  vfs: move ACL cache lookup into generic code
  CIFS: Fix oops while mounting with prefixpath
  xfs: Fix wrong return value of xfs_file_aio_write
  fix devtmpfs race
  caam: don't pass bogus S_IFCHR to debugfs_create_...()
  get rid of create_proc_entry() abuses - proc_mkdir() is there for purpose
  asus-wmi: ->is_visible() can't return negative
  fix jffs2 ACLs on big-endian with 16bit mode_t
  9p: close ACL leaks
  ocfs2_init_acl(): fix a leak
  VFS : mount lock scalability for internal mounts

3 files changed, 36 insertions, 55 deletions

diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index e98f56d3787d..814be079c185 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -96,14 +96,11 @@ static struct posix_acl *v9fs_get_cached_acl(struct inode *inode, int type)
         return acl;
 }
 
-int v9fs_check_acl(struct inode *inode, int mask)
+struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type)
 {
         struct posix_acl *acl;
         struct v9fs_session_info *v9ses;
 
-        if (mask & MAY_NOT_BLOCK)
-                return -ECHILD;
-
         v9ses = v9fs_inode2v9ses(inode);
         if (((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT) ||
                         ((v9ses->flags & V9FS_ACL_MASK) != V9FS_POSIX_ACL)) {
@@ -111,18 +108,10 @@ int v9fs_check_acl(struct inode *inode, int mask)
                  * On access = client  and acl = on mode get the acl
                  * values from the server
                  */
-                return 0;
+                return NULL;
         }
-        acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS);
+        return v9fs_get_cached_acl(inode, type);
 
-        if (IS_ERR(acl))
-                return PTR_ERR(acl);
-        if (acl) {
-                int error = posix_acl_permission(inode, acl, mask);
-                posix_acl_release(acl);
-                return error;
-        }
-        return -EAGAIN;
 }
 
 static int v9fs_set_acl(struct dentry *dentry, int type, struct posix_acl *acl)
@@ -165,32 +154,32 @@ err_free_out:
 int v9fs_acl_chmod(struct dentry *dentry)
 {
         int retval = 0;
-        struct posix_acl *acl, *clone;
+        struct posix_acl *acl;
         struct inode *inode = dentry->d_inode;
 
         if (S_ISLNK(inode->i_mode))
                 return -EOPNOTSUPP;
         acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS);
         if (acl) {
-                clone = posix_acl_clone(acl, GFP_KERNEL);
+                retval = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
+                if (retval)
+                        return retval;
+                retval = v9fs_set_acl(dentry, ACL_TYPE_ACCESS, acl);
                 posix_acl_release(acl);
-                if (!clone)
-                        return -ENOMEM;
-                retval = posix_acl_chmod_masq(clone, inode->i_mode);
-                if (!retval)
-                        retval = v9fs_set_acl(dentry, ACL_TYPE_ACCESS, clone);
-                posix_acl_release(clone);
         }
         return retval;
 }
 
 int v9fs_set_create_acl(struct dentry *dentry,
-                        struct posix_acl *dpacl, struct posix_acl *pacl)
+                        struct posix_acl **dpacl, struct posix_acl **pacl)
 {
-        v9fs_set_acl(dentry, ACL_TYPE_DEFAULT, dpacl);
-        v9fs_set_acl(dentry, ACL_TYPE_ACCESS, pacl);
-        posix_acl_release(dpacl);
-        posix_acl_release(pacl);
+        if (dentry) {
+                v9fs_set_acl(dentry, ACL_TYPE_DEFAULT, *dpacl);
+                v9fs_set_acl(dentry, ACL_TYPE_ACCESS, *pacl);
+        }
+        posix_acl_release(*dpacl);
+        posix_acl_release(*pacl);
+        *dpacl = *pacl = NULL;
         return 0;
 }
 
@@ -209,29 +198,18 @@ int v9fs_acl_mode(struct inode *dir, mode_t *modep,
                         mode &= ~current_umask();
         }
         if (acl) {
-                struct posix_acl *clone;
-
                 if (S_ISDIR(mode))
-                        *dpacl = acl;
-                clone = posix_acl_clone(acl, GFP_NOFS);
-                retval = -ENOMEM;
-                if (!clone)
-                        goto cleanup;
-
-                retval = posix_acl_create_masq(clone, &mode);
-                if (retval < 0) {
-                        posix_acl_release(clone);
-                        goto cleanup;
-                }
+                        *dpacl = posix_acl_dup(acl);
+                retval = posix_acl_create(&acl, GFP_NOFS, &mode);
+                if (retval < 0)
+                        return retval;
                 if (retval > 0)
-                        *pacl = clone;
+                        *pacl = acl;
+                else
+                        posix_acl_release(acl);
         }
         *modep  = mode;
         return 0;
-cleanup:
-        posix_acl_release(acl);
-        return retval;
-
 }
 
 static int v9fs_remote_get_acl(struct dentry *dentry, const char *name,
diff --git a/fs/9p/acl.h b/fs/9p/acl.h
index 59e18c2e8c7e..ddb7ae19d971 100644
--- a/fs/9p/acl.h
+++ b/fs/9p/acl.h
@@ -16,14 +16,14 @@
 
 #ifdef CONFIG_9P_FS_POSIX_ACL
 extern int v9fs_get_acl(struct inode *, struct p9_fid *);
-extern int v9fs_check_acl(struct inode *inode, int mask);
+extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type);
 extern int v9fs_acl_chmod(struct dentry *);
 extern int v9fs_set_create_acl(struct dentry *,
-                               struct posix_acl *, struct posix_acl *);
+                               struct posix_acl **, struct posix_acl **);
 extern int v9fs_acl_mode(struct inode *dir, mode_t *modep,
                          struct posix_acl **dpacl, struct posix_acl **pacl);
 #else
-#define v9fs_check_acl NULL
+#define v9fs_iop_get_acl NULL
 static inline int v9fs_get_acl(struct inode *inode, struct p9_fid *fid)
 {
         return 0;
@@ -33,8 +33,8 @@ static inline int v9fs_acl_chmod(struct dentry *dentry)
         return 0;
 }
 static inline int v9fs_set_create_acl(struct dentry *dentry,
-                                      struct posix_acl *dpacl,
-                                      struct posix_acl *pacl)
+                                      struct posix_acl **dpacl,
+                                      struct posix_acl **pacl)
 {
         return 0;
 }
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 276f4a69ecd4..9a26dce5a99f 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -287,7 +287,7 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode,
                 goto error;
 
         /* Now set the ACL based on the default value */
-        v9fs_set_create_acl(dentry, dacl, pacl);
+        v9fs_set_create_acl(dentry, &dacl, &pacl);
 
         v9inode = V9FS_I(inode);
         mutex_lock(&v9inode->v_mutex);
@@ -328,6 +328,7 @@ error:
 err_clunk_old_fid:
         if (ofid)
                 p9_client_clunk(ofid);
+        v9fs_set_create_acl(NULL, &dacl, &pacl);
         return err;
 }
 
@@ -421,12 +422,13 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
                 d_instantiate(dentry, inode);
         }
         /* Now set the ACL based on the default value */
-        v9fs_set_create_acl(dentry, dacl, pacl);
+        v9fs_set_create_acl(dentry, &dacl, &pacl);
         inc_nlink(dir);
         v9fs_invalidate_inode_attr(dir);
 error:
         if (fid)
                 p9_client_clunk(fid);
+        v9fs_set_create_acl(NULL, &dacl, &pacl);
         return err;
 }
 
@@ -826,10 +828,11 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, int omode,
                 d_instantiate(dentry, inode);
         }
         /* Now set the ACL based on the default value */
-        v9fs_set_create_acl(dentry, dacl, pacl);
+        v9fs_set_create_acl(dentry, &dacl, &pacl);
 error:
         if (fid)
                 p9_client_clunk(fid);
+        v9fs_set_create_acl(NULL, &dacl, &pacl);
         return err;
 }
 
@@ -914,7 +917,7 @@ const struct inode_operations v9fs_dir_inode_operations_dotl = {
         .getxattr = generic_getxattr,
         .removexattr = generic_removexattr,
         .listxattr = v9fs_listxattr,
-        .check_acl = v9fs_check_acl,
+        .get_acl = v9fs_iop_get_acl,
 };
 
 const struct inode_operations v9fs_file_inode_operations_dotl = {
@@ -924,7 +927,7 @@ const struct inode_operations v9fs_file_inode_operations_dotl = {
         .getxattr = generic_getxattr,
         .removexattr = generic_removexattr,
         .listxattr = v9fs_listxattr,
-        .check_acl = v9fs_check_acl,
+        .get_acl = v9fs_iop_get_acl,
 };
 
 const struct inode_operations v9fs_symlink_inode_operations_dotl = {