|
@@ -311,7 +311,9 @@ struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type)
|
|
|
if (had_lock < 0)
|
|
|
return ERR_PTR(had_lock);
|
|
|
|
|
|
+ down_read(&OCFS2_I(inode)->ip_xattr_sem);
|
|
|
acl = ocfs2_get_acl_nolock(inode, type, di_bh);
|
|
|
+ up_read(&OCFS2_I(inode)->ip_xattr_sem);
|
|
|
|
|
|
ocfs2_inode_unlock_tracker(inode, 0, &oh, had_lock);
|
|
|
brelse(di_bh);
|
|
@@ -330,7 +332,9 @@ int ocfs2_acl_chmod(struct inode *inode, struct buffer_head *bh)
|
|
|
if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))
|
|
|
return 0;
|
|
|
|
|
|
+ down_read(&OCFS2_I(inode)->ip_xattr_sem);
|
|
|
acl = ocfs2_get_acl_nolock(inode, ACL_TYPE_ACCESS, bh);
|
|
|
+ up_read(&OCFS2_I(inode)->ip_xattr_sem);
|
|
|
if (IS_ERR(acl) || !acl)
|
|
|
return PTR_ERR(acl);
|
|
|
ret = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
|
|
@@ -361,8 +365,10 @@ int ocfs2_init_acl(handle_t *handle,
|
|
|
|
|
|
if (!S_ISLNK(inode->i_mode)) {
|
|
|
if (osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL) {
|
|
|
+ down_read(&OCFS2_I(dir)->ip_xattr_sem);
|
|
|
acl = ocfs2_get_acl_nolock(dir, ACL_TYPE_DEFAULT,
|
|
|
dir_bh);
|
|
|
+ up_read(&OCFS2_I(dir)->ip_xattr_sem);
|
|
|
if (IS_ERR(acl))
|
|
|
return PTR_ERR(acl);
|
|
|
}
|