X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Focfs2%2Facl.c;h=aff23e59b58c4c39016f7e2bc5719fea2057cf8a;hb=e77819e57f0817c6dc7cadd061acd70c604cbce2;hp=e913ad130fdd2cf9eafa0e73e343bad5974583e9;hpb=0965537308ac3b267ea16e731bd73870a51c53b8;p=pandora-kernel.git

diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
index e913ad130fdd..aff23e59b58c 100644
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
@@ -290,16 +290,13 @@ static int ocfs2_set_acl(handle_t *handle,
 	return ret;
 }
 
-int ocfs2_check_acl(struct inode *inode, int mask, unsigned int flags)
+int ocfs2_check_acl(struct inode *inode, int mask)
 {
 	struct ocfs2_super *osb;
 	struct buffer_head *di_bh = NULL;
 	struct posix_acl *acl;
 	int ret = -EAGAIN;
 
-	if (flags & IPERM_FLAG_RCU)
-		return -ECHILD;
-
 	osb = OCFS2_SB(inode->i_sb);
 	if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))
 		return ret;
@@ -409,6 +406,7 @@ int ocfs2_init_acl(handle_t *handle,
 			if (ret2) {
 				mlog_errno(ret2);
 				ret = ret2;
+				posix_acl_release(clone);
 				goto cleanup;
 			}
 			if (ret > 0) {