--- fs/ocfs2/acl.c

+++ fs/ocfs2/acl.c

@@ -293,12 +293,30 @@ static int ocfs2_set_acl(handle_t *handl

int ocfs2_check_acl(struct inode *inode, int mask)

{

- struct posix_acl *acl = ocfs2_get_acl(inode, ACL_TYPE_ACCESS);

+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

+ struct buffer_head *di_bh = NULL;

+ struct posix_acl *acl;

+ int ret = -EAGAIN;

+

+ if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))

+ return ret;

+

+ ret = ocfs2_read_inode_block(inode, &di_bh);

+ if (ret < 0) {

+ mlog_errno(ret);

+ return ret;

+ }

- if (IS_ERR(acl))

+ acl = ocfs2_get_acl_nolock(inode, ACL_TYPE_ACCESS, di_bh);

+

+ brelse(di_bh);

+

+ if (IS_ERR(acl)) {

+ mlog_errno(PTR_ERR(acl));

return PTR_ERR(acl);

+ }

if (acl) {

- int ret = posix_acl_permission(inode, acl, mask);

+ ret = posix_acl_permission(inode, acl, mask);

posix_acl_release(acl);

return ret;

}

@@ -347,7 +365,7 @@ int ocfs2_init_acl(handle_t *handle,

{

struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

struct posix_acl *acl = NULL;

- int ret = 0;

+ int ret = 0, ret2;

mode_t mode;

if (!S_ISLNK(inode->i_mode)) {

@@ -384,7 +402,12 @@ int ocfs2_init_acl(handle_t *handle,

mode = inode->i_mode;

ret = posix_acl_create_masq(clone, &mode);

if (ret >= 0) {

- ret = ocfs2_acl_set_mode(inode, di_bh, handle, mode);

+ ret2 = ocfs2_acl_set_mode(inode, di_bh, handle, mode);

+ if (ret2) {

+ mlog_errno(ret2);

+ ret = ret2;

+ goto cleanup;

+ }

if (ret > 0) {

ret = ocfs2_set_acl(handle, inode,

di_bh, ACL_TYPE_ACCESS,