aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p/vfs_inode_dotl.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/9p/vfs_inode_dotl.c')
-rw-r--r--fs/9p/vfs_inode_dotl.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 44485f353f19..dd6355721fc7 100644
--- 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,
331 d_instantiate(dentry, inode); 331 d_instantiate(dentry, inode);
332 332
333 /* Now set the ACL based on the default value */ 333 /* Now set the ACL based on the default value */
334 v9fs_set_create_acl(dentry, &dacl, &pacl); 334 v9fs_set_create_acl(dentry, dacl, pacl);
335 335
336 v9inode = V9FS_I(inode); 336 v9inode = V9FS_I(inode);
337 mutex_lock(&v9inode->v_mutex); 337 mutex_lock(&v9inode->v_mutex);
@@ -364,6 +364,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
364#endif 364#endif
365 *opened |= FILE_CREATED; 365 *opened |= FILE_CREATED;
366out: 366out:
367 v9fs_put_acl(dacl, pacl);
367 dput(res); 368 dput(res);
368 return err; 369 return err;
369 370
@@ -373,7 +374,6 @@ error:
373err_clunk_old_fid: 374err_clunk_old_fid:
374 if (ofid) 375 if (ofid)
375 p9_client_clunk(ofid); 376 p9_client_clunk(ofid);
376 v9fs_set_create_acl(NULL, &dacl, &pacl);
377 goto out; 377 goto out;
378} 378}
379 379
@@ -467,13 +467,13 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
467 d_instantiate(dentry, inode); 467 d_instantiate(dentry, inode);
468 } 468 }
469 /* Now set the ACL based on the default value */ 469 /* Now set the ACL based on the default value */
470 v9fs_set_create_acl(dentry, &dacl, &pacl); 470 v9fs_set_create_acl(dentry, dacl, pacl);
471 inc_nlink(dir); 471 inc_nlink(dir);
472 v9fs_invalidate_inode_attr(dir); 472 v9fs_invalidate_inode_attr(dir);
473error: 473error:
474 if (fid) 474 if (fid)
475 p9_client_clunk(fid); 475 p9_client_clunk(fid);
476 v9fs_set_create_acl(NULL, &dacl, &pacl); 476 v9fs_put_acl(dacl, pacl);
477 return err; 477 return err;
478} 478}
479 479
@@ -912,11 +912,11 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
912 d_instantiate(dentry, inode); 912 d_instantiate(dentry, inode);
913 } 913 }
914 /* Now set the ACL based on the default value */ 914 /* Now set the ACL based on the default value */
915 v9fs_set_create_acl(dentry, &dacl, &pacl); 915 v9fs_set_create_acl(dentry, dacl, pacl);
916error: 916error:
917 if (fid) 917 if (fid)
918 p9_client_clunk(fid); 918 p9_client_clunk(fid);
919 v9fs_set_create_acl(NULL, &dacl, &pacl); 919 v9fs_put_acl(dacl, pacl);
920 return err; 920 return err;
921} 921}
922 922