9p: split dropping the acls from v9fs_set_create_acl()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index 81ae143ff3f7a37a05d6998b07fa230838cb6808..5b91689ac0b1b458b1cf42dd13a051197cf0c1ec 100644 (file)
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -167,23 +167,25 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid)
 }
 
 int v9fs_set_create_acl(struct dentry *dentry,
-                       struct posix_acl **dpacl, struct posix_acl **pacl)
+                       struct posix_acl *dacl, struct posix_acl *acl)
 {
-       if (dentry) {
-               struct p9_fid *fid = v9fs_fid_lookup(dentry);
-               set_cached_acl(dentry->d_inode, ACL_TYPE_DEFAULT, *dpacl);
-               set_cached_acl(dentry->d_inode, ACL_TYPE_ACCESS, *pacl);
-               if (!IS_ERR(fid)) {
-                       v9fs_set_acl(fid, ACL_TYPE_DEFAULT, *dpacl);
-                       v9fs_set_acl(fid, ACL_TYPE_ACCESS, *pacl);
-               }
+       struct p9_fid *fid = v9fs_fid_lookup(dentry);
+       set_cached_acl(dentry->d_inode, ACL_TYPE_DEFAULT, dacl);
+       set_cached_acl(dentry->d_inode, ACL_TYPE_ACCESS, acl);
+       if (!IS_ERR(fid)) {
+               v9fs_set_acl(fid, ACL_TYPE_DEFAULT, dacl);
+               v9fs_set_acl(fid, ACL_TYPE_ACCESS, acl);
        }
-       posix_acl_release(*dpacl);
-       posix_acl_release(*pacl);
-       *dpacl = *pacl = NULL;
        return 0;
 }
 
+void v9fs_put_acl(struct posix_acl *dacl,
+                 struct posix_acl *acl)
+{
+       posix_acl_release(dacl);
+       posix_acl_release(acl);
+}
+
 int v9fs_acl_mode(struct inode *dir, umode_t *modep,
                  struct posix_acl **dpacl, struct posix_acl **pacl)
 {

diff --git a/fs/9p/acl.h b/fs/9p/acl.h
index 3a609c57b6eaadd1066d1267cdb6e08d23ed61af..cb7fc54081f7a20e3a85d642746165013ed7c621 100644 (file)
--- a/fs/9p/acl.h
+++ b/fs/9p/acl.h
@@ -19,9 +19,10 @@ extern int v9fs_get_acl(struct inode *, struct p9_fid *);
 extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type);
 extern int v9fs_acl_chmod(struct inode *, struct p9_fid *);
 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, umode_t *modep,
                         struct posix_acl **dpacl, struct posix_acl **pacl);
+extern void v9fs_put_acl(struct posix_acl *dacl, struct posix_acl *acl);
 #else
 #define v9fs_iop_get_acl NULL
 static inline int v9fs_get_acl(struct inode *inode, struct p9_fid *fid)
@@ -33,11 +34,15 @@ static inline int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid)
        return 0;
 }
 static inline int v9fs_set_create_acl(struct dentry *dentry,
-                                     struct posix_acl **dpacl,
-                                     struct posix_acl **pacl)
+                                     struct posix_acl *dacl,
+                                     struct posix_acl *acl)
 {
        return 0;
 }
+static inline void v9fs_put_acl(struct posix_acl *dacl,
+                               struct posix_acl *acl)
+{
+}
 static inline int v9fs_acl_mode(struct inode *dir, umode_t *modep,
                                struct posix_acl **dpacl,
                                struct posix_acl **pacl)

diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 44485f353f192bf695d15b3961be99de1df7ad65..dd6355721fc72ac9e04beaf37d0875652b9a00d9 100644 (file)
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -331,7 +331,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
        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);
 
        v9inode = V9FS_I(inode);
        mutex_lock(&v9inode->v_mutex);
@@ -364,6 +364,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
 #endif
        *opened |= FILE_CREATED;
 out:
+       v9fs_put_acl(dacl, pacl);
        dput(res);
        return err;
 
@@ -373,7 +374,6 @@ error:
 err_clunk_old_fid:
        if (ofid)
                p9_client_clunk(ofid);
-       v9fs_set_create_acl(NULL, &dacl, &pacl);
        goto out;
 }
 
@@ -467,13 +467,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);
+       v9fs_put_acl(dacl, pacl);
        return err;
 }
 
@@ -912,11 +912,11 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t 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);
+       v9fs_put_acl(dacl, pacl);
        return err;
 }