From: Richard Weinberger <richard@nod.at>
Date: Wed, 29 Oct 2014 21:50:53 +0000 (-0700)
Subject: ocfs2: fix d_splice_alias() return code checking
X-Git-Tag: omap-for-v3.19/fixes-not-urgent-part1~39^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3556babd7facb8fbc596bada0d67139e3b22330;p=pandora-kernel.git

ocfs2: fix d_splice_alias() return code checking

d_splice_alias() can return a valid dentry, NULL or an ERR_PTR.
Currently the code checks not for ERR_PTR and will cuase an oops in
ocfs2_dentry_attach_lock().  Fix this by using IS_ERR_OR_NULL().

Signed-off-by: Richard Weinberger <richard@nod.at>
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>
---

Reading git-diff-tree failed