The patch titled Subject: ocfs2: Fix xattr check in ocfs2_get_xattr_nolock() has been added to the -mm tree. Its filename is ocfs2-fix-xattr-check-in-ocfs2_get_xattr_nolock.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-fix-xattr-check-in-ocfs2_get_xattr_nolock.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-fix-xattr-check-in-ocfs2_get_xattr_nolock.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: Jan Kara <jack@xxxxxxx> Subject: ocfs2: Fix xattr check in ocfs2_get_xattr_nolock() ocfs2_get_xattr_nolock() checks whether inode has any extended attributes (OCFS2_HAS_XATTR_FL). If not, it just sets 'ret' to -ENODATA but continues with checking inline and external attributes anyway (which is pointless although it does not harm). Just return immediately when we know there are no extended attributes in the inode. Coverity id: 1226906. Signed-off-by: Jan Kara <jack@xxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> 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-xattr-check-in-ocfs2_get_xattr_nolock fs/ocfs2/xattr.c --- a/fs/ocfs2/xattr.c~ocfs2-fix-xattr-check-in-ocfs2_get_xattr_nolock +++ a/fs/ocfs2/xattr.c @@ -1284,7 +1284,7 @@ int ocfs2_xattr_get_nolock(struct inode return -EOPNOTSUPP; if (!(oi->ip_dyn_features & OCFS2_HAS_XATTR_FL)) - ret = -ENODATA; + return -ENODATA; xis.inode_bh = xbs.inode_bh = di_bh; di = (struct ocfs2_dinode *)di_bh->b_data; _ Patches currently in -mm which might be from jack@xxxxxxx are origin.patch fallocate-create-fan_modify-and-in_modify-events.patch fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch ocfs2-fix-xattr-check-in-ocfs2_get_xattr_nolock.patch fs-mpagec-forgotten-write_sync-in-case-of-data-integrity-write.patch mm-add-strictlimit-knob-v2.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