[Ocfs2-devel] [patch] ocfs2: remove unneeded NULL check

Dan Carpenter dan.carpenter at oracle.com
Fri Nov 28 00:30:40 PST 2014


In 1faf289454b9 ('ocfs2_dlm: disallow a domain join if node maps
mismatch') then 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 at oracle.com>

diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 02d315f..50a59d2 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,
 	 * 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);
 



More information about the Ocfs2-devel mailing list