diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 656537d94..6967c7e0e 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -2539,6 +2539,7 @@ static void scst_queue_report_luns_changed_UA(struct scst_session *sess,
 
 	local_bh_disable();
 
+#if !defined(__CHECKER__)
 	for (i = 0; i < SESS_TGT_DEV_LIST_HASH_SIZE; i++) {
 		head = &sess->sess_tgt_dev_list[i];
 
@@ -2548,6 +2549,7 @@ static void scst_queue_report_luns_changed_UA(struct scst_session *sess,
 			spin_lock(&tgt_dev->tgt_dev_lock);
 		}
 	}
+#endif
 
 	for (i = 0; i < SESS_TGT_DEV_LIST_HASH_SIZE; i++) {
 		head = &sess->sess_tgt_dev_list[i];
@@ -2568,6 +2570,7 @@ static void scst_queue_report_luns_changed_UA(struct scst_session *sess,
 		}
 	}
 
+#if !defined(__CHECKER__)
 	for (i = SESS_TGT_DEV_LIST_HASH_SIZE-1; i >= 0; i--) {
 		head = &sess->sess_tgt_dev_list[i];
 
@@ -2576,6 +2579,7 @@ static void scst_queue_report_luns_changed_UA(struct scst_session *sess,
 			spin_unlock(&tgt_dev->tgt_dev_lock);
 		}
 	}
+#endif
 
 	local_bh_enable();
 
@@ -8304,6 +8308,7 @@ again:
 	if (UA_entry->global_UA && first) {
 		TRACE_MGMT_DBG("Global UA %p detected", UA_entry);
 
+#if !defined(__CHECKER__)
 		spin_unlock_bh(&cmd->tgt_dev->tgt_dev_lock);
 
 		/*
@@ -8323,6 +8328,7 @@ again:
 				spin_lock(&tgt_dev->tgt_dev_lock);
 			}
 		}
+#endif
 
 		first = false;
 		global_unlock = true;
@@ -8385,6 +8391,7 @@ again:
 
 out_unlock:
 	if (global_unlock) {
+#if !defined(__CHECKER__)
 		for (i = SESS_TGT_DEV_LIST_HASH_SIZE-1; i >= 0; i--) {
 			struct list_head *head = &sess->sess_tgt_dev_list[i];
 			struct scst_tgt_dev *tgt_dev;
@@ -8396,6 +8403,7 @@ out_unlock:
 
 		local_bh_enable();
 		spin_lock_bh(&cmd->tgt_dev->tgt_dev_lock);
+#endif
 	}
 
 	spin_unlock_bh(&cmd->tgt_dev->tgt_dev_lock);
diff --git a/scst/src/scst_pres.c b/scst/src/scst_pres.c
index d47a38d6c..15981530d 100644
--- a/scst/src/scst_pres.c
+++ b/scst/src/scst_pres.c
@@ -456,8 +456,10 @@ static struct scst_dev_registrant *scst_pr_add_registrant(
 	 * We can't use scst_mutex here, because of the circular
 	 * locking dependency with dev_pr_mutex.
 	 */
+#if !defined(__CHECKER__)
 	if (!dev_lock_locked)
 		spin_lock_bh(&dev->dev_lock);
+#endif
 	list_for_each_entry(t, &dev->dev_tgt_dev_list, dev_tgt_dev_list_entry) {
 		if (tid_equal(t->sess->transport_id, transport_id) &&
 		    (t->sess->tgt->rel_tgt_id == rel_tgt_id) &&
@@ -472,8 +474,10 @@ static struct scst_dev_registrant *scst_pr_add_registrant(
 			break;
 		}
 	}
+#if !defined(__CHECKER__)
 	if (!dev_lock_locked)
 		spin_unlock_bh(&dev->dev_lock);
+#endif
 
 	list_add_tail(&reg->dev_registrants_list_entry,
 		&dev->dev_registrants_list);