Commit b3e3e5af authored Dec 10, 2014 by Dan Carpenter Committed by Linus Torvalds Dec 10, 2014

ocfs2: remove unneeded NULL check

In commit 1faf2894 ("ocfs2_dlm: disallow a domain join if node maps
mismatch") we introduced a new earlier NULL check so this one is not
needed.  Also static checkers complain because we dereference it first
and then check for NULL.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
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 88d69b92

fs/ocfs2/dlm/dlmdomain.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -877,7 +877,7 @@ static int dlm_query_join_handler(struct o2net_msg msg, u32 len, void data,
		* to be put in someone's domain map.
		* Also, explicitly disallow joining at certain troublesome
		* times (ie. during recovery). */
		if (dlm && dlm->dlm_state != DLM_CTXT_LEAVING) {
		if (dlm->dlm_state != DLM_CTXT_LEAVING) {
		int bit = query->node_idx;
		spin_lock(&dlm->spinlock);