9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate()

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

3 files changed, 33 insertions, 35 deletions

diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index 5b91689ac0b1..7af425f53bee 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -166,16 +166,13 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid)
         return retval;
 }
 
-int v9fs_set_create_acl(struct dentry *dentry,
+int v9fs_set_create_acl(struct inode *inode, struct p9_fid *fid,
                         struct posix_acl *dacl, struct posix_acl *acl)
 {
-        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);
-        }
+        set_cached_acl(inode, ACL_TYPE_DEFAULT, dacl);
+        set_cached_acl(inode, ACL_TYPE_ACCESS, acl);
+        v9fs_set_acl(fid, ACL_TYPE_DEFAULT, dacl);
+        v9fs_set_acl(fid, ACL_TYPE_ACCESS, acl);
         return 0;
 }
 
diff --git a/fs/9p/acl.h b/fs/9p/acl.h
index cb7fc54081f7..e4f7e882272b 100644
--- a/fs/9p/acl.h
+++ b/fs/9p/acl.h
@@ -18,7 +18,7 @@
 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 *,
+extern int v9fs_set_create_acl(struct inode *, struct p9_fid *,
                                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);
@@ -33,7 +33,8 @@ 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,
+static inline int v9fs_set_create_acl(struct inode *inode,
+                                      struct p9_fid *fid,
                                       struct posix_acl *dacl,
                                       struct posix_acl *acl)
 {
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index dd6355721fc7..7c295588150c 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -325,14 +325,14 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
                 p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n", err);
                 goto error;
         }
+        /* Now set the ACL based on the default value */
+        v9fs_set_create_acl(inode, fid, dacl, pacl);
+
         err = v9fs_fid_add(dentry, fid);
         if (err < 0)
                 goto error;
         d_instantiate(dentry, inode);
 
-        /* Now set the ACL based on the default value */
-        v9fs_set_create_acl(dentry, dacl, pacl);
-
         v9inode = V9FS_I(inode);
         mutex_lock(&v9inode->v_mutex);
         if (v9ses->cache && !v9inode->writeback_fid &&
@@ -430,17 +430,17 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
         if (err < 0)
                 goto error;
 
+        fid = p9_client_walk(dfid, 1, &name, 1);
+        if (IS_ERR(fid)) {
+                err = PTR_ERR(fid);
+                p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n",
+                         err);
+                fid = NULL;
+                goto error;
+        }
+
         /* instantiate inode and assign the unopened fid to the dentry */
         if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
-                fid = p9_client_walk(dfid, 1, &name, 1);
-                if (IS_ERR(fid)) {
-                        err = PTR_ERR(fid);
-                        p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n",
-                                 err);
-                        fid = NULL;
-                        goto error;
-                }
-
                 inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);
                 if (IS_ERR(inode)) {
                         err = PTR_ERR(inode);
@@ -451,6 +451,7 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
                 err = v9fs_fid_add(dentry, fid);
                 if (err < 0)
                         goto error;
+                v9fs_set_create_acl(inode, fid, dacl, pacl);
                 d_instantiate(dentry, inode);
                 fid = NULL;
         } else {
@@ -464,10 +465,9 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
                         err = PTR_ERR(inode);
                         goto error;
                 }
+                v9fs_set_create_acl(inode, fid, dacl, pacl);
                 d_instantiate(dentry, inode);
         }
-        /* Now set the ACL based on the default value */
-        v9fs_set_create_acl(dentry, dacl, pacl);
         inc_nlink(dir);
         v9fs_invalidate_inode_attr(dir);
 error:
@@ -876,17 +876,17 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
                 goto error;
 
         v9fs_invalidate_inode_attr(dir);
+        fid = p9_client_walk(dfid, 1, &name, 1);
+        if (IS_ERR(fid)) {
+                err = PTR_ERR(fid);
+                p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n",
+                         err);
+                fid = NULL;
+                goto error;
+        }
+
         /* instantiate inode and assign the unopened fid to the dentry */
         if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
-                fid = p9_client_walk(dfid, 1, &name, 1);
-                if (IS_ERR(fid)) {
-                        err = PTR_ERR(fid);
-                        p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n",
-                                 err);
-                        fid = NULL;
-                        goto error;
-                }
-
                 inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);
                 if (IS_ERR(inode)) {
                         err = PTR_ERR(inode);
@@ -894,6 +894,7 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
                                  err);
                         goto error;
                 }
+                v9fs_set_create_acl(inode, fid, dacl, pacl);
                 err = v9fs_fid_add(dentry, fid);
                 if (err < 0)
                         goto error;
@@ -909,10 +910,9 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
                         err = PTR_ERR(inode);
                         goto error;
                 }
+                v9fs_set_create_acl(inode, fid, dacl, pacl);
                 d_instantiate(dentry, inode);
         }
-        /* Now set the ACL based on the default value */
-        v9fs_set_create_acl(dentry, dacl, pacl);
 error:
         if (fid)
                 p9_client_clunk(fid);