Commit 2b693005 authored Dec 10, 2014 by Jan Kara Committed by Linus Torvalds Dec 10, 2014

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@suse.cz>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 519a2861

fs/ocfs2/xattr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1284,7 +1284,7 @@ int ocfs2_xattr_get_nolock(struct inode *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;

Admin message