The patch titled Subject: ocfs2: Fix xattr check in ocfs2_get_xattr_nolock() has been removed from the -mm tree. Its filename was ocfs2-fix-xattr-check-in-ocfs2_get_xattr_nolock.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ 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 fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch fs-mpagec-forgotten-write_sync-in-case-of-data-integrity-write.patch befs-remove-dead-code.patch linux-next.patch fallocate-create-fan_modify-and-in_modify-events.patch fsnotify-unify-inode-and-mount-marks-handling.patch fsnotify-remove-destroy_list-from-fsnotify_mark.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