The patch titled Subject: ocfs2: fix ocfs2_init_security_and_acl() to initialize acl correctly has been added to the -mm tree. Its filename is ocfs2-fix-ocfs2_init_security_and_acl-to-initialize-acl-correctly.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Jeff Liu <jeff.liu@xxxxxxxxxx> Subject: ocfs2: fix ocfs2_init_security_and_acl() to initialize acl correctly We need to re-initialize the security if it isn't preserved for ocfs2_reflink(). however, the code logic is broken at ocfs2_init_security_and_acl() although ocfs2_init_security_get() succeed, as a result, ocfs2_acl_init() does not involked. Note this was introduced by 9d8f13ba3 ("security: new security_inode_init_security API adds function callback") Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx> Reviewed-by: Tao Ma <boyu.mt@xxxxxxxxxx> Cc: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/ocfs2/xattr.c~ocfs2-fix-ocfs2_init_security_and_acl-to-initialize-acl-correctly fs/ocfs2/xattr.c --- a/fs/ocfs2/xattr.c~ocfs2-fix-ocfs2_init_security_and_acl-to-initialize-acl-correctly +++ a/fs/ocfs2/xattr.c @@ -7189,7 +7189,7 @@ int ocfs2_init_security_and_acl(struct i struct buffer_head *dir_bh = NULL; ret = ocfs2_init_security_get(inode, dir, qstr, NULL); - if (!ret) { + if (ret) { mlog_errno(ret); goto leave; } _ Patches currently in -mm which might be from jeff.liu@xxxxxxxxxx are origin.patch linux-next.patch ocfs2-fix-ocfs2_init_security_and_acl-to-initialize-acl-correctly.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html