diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-12-10 18:42:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 20:41:04 -0500 |
commit | b3e3e5af60e0fda182e978f568cc512568c024cf (patch) | |
tree | 2ae550c649d8f302e89af076c7c25bbfcd4fcfc7 /fs/ocfs2 | |
parent | 88d69b92fc12084af43cba428bda9727c0ca084f (diff) |
ocfs2: remove unneeded NULL check
In commit 1faf289454b9 ("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>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/dlm/dlmdomain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 02d315fef432..50a59d2337b2 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c | |||
@@ -877,7 +877,7 @@ static int dlm_query_join_handler(struct o2net_msg *msg, u32 len, void *data, | |||
877 | * to be put in someone's domain map. | 877 | * to be put in someone's domain map. |
878 | * Also, explicitly disallow joining at certain troublesome | 878 | * Also, explicitly disallow joining at certain troublesome |
879 | * times (ie. during recovery). */ | 879 | * times (ie. during recovery). */ |
880 | if (dlm && dlm->dlm_state != DLM_CTXT_LEAVING) { | 880 | if (dlm->dlm_state != DLM_CTXT_LEAVING) { |
881 | int bit = query->node_idx; | 881 | int bit = query->node_idx; |
882 | spin_lock(&dlm->spinlock); | 882 | spin_lock(&dlm->spinlock); |
883 | 883 | ||