Change BUG_ON(1) into BUG() (merge r5618 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@5695 d57e44dd-8a1f-0410-8b47-8ef2f437770f

iscsi-scst/kernel/iscsi.c

@@ -3609,7 +3609,7 @@ static void iscsi_task_mgmt_fn_done(struct scst_mgmt_cmd *scst_mcmd)
 	case SCST_ABORT_ALL_TASKS_SESS:
 	case SCST_ABORT_ALL_TASKS:
 	case SCST_NEXUS_LOSS:
-		sBUG_ON(1);
+		sBUG();
 		break;
 	default:
 		iscsi_send_task_mgmt_resp(req, status, scst_mgmt_cmd_dropped(scst_mcmd));

iscsi-scst/kernel/nthread.c

@@ -368,7 +368,7 @@ void iscsi_task_mgmt_affected_cmds_done(struct scst_mgmt_cmd *scst_mcmd)
 	case SCST_ABORT_ALL_TASKS_SESS:
 	case SCST_ABORT_ALL_TASKS:
 	case SCST_NEXUS_LOSS:
-		sBUG_ON(1);
+		sBUG();
 		break;
 	default:
 		/* Nothing to do */

mvsas_tgt/mv_init.c

@@ -193,7 +193,7 @@ static void mvs_tasklet(unsigned long opaque)
 	mvi = ((struct mvs_prv_info *)sha->lldd_ha)->mvi[0];
 
 	if (unlikely(!mvi))
-		BUG_ON(1);
+		BUG();
 
 	for (i = 0; i < core_nr; i++) {
 		mvi = ((struct mvs_prv_info *)sha->lldd_ha)->mvi[i];

mvsas_tgt/mv_tgt.c

@@ -1224,7 +1224,7 @@ static void mvst_do_cmd_completion(struct mvs_info *mvi,
 			TRACE_DBG("Read data command %p finished", cmd);
 			if (err) {
 				cmd->cmd_state = MVST_STATE_SEND_DATA_RETRY;
-				sBUG_ON(1);
+				sBUG();
 			}
 			goto out;
 		} else if (cmd->cmd_state == MVST_STATE_ABORTED) {

qla2x00t/qla2x00-target/qla2x00t.c

@@ -5606,7 +5606,7 @@ static void q2t_exec_sess_work(struct q2t_tgt *tgt,
 			loop_id = GET_TARGET_ID(ha, &prm->tm_iocb);
 		break;
 	default:
-		sBUG_ON(1);
+		sBUG();
 		break;
 	}
 
@@ -5683,7 +5683,7 @@ send:
 		break;
 	}
 	default:
-		sBUG_ON(1);
+		sBUG();
 		break;
 	}
 
@@ -5733,7 +5733,7 @@ out_term:
 				0, 0, 0, 0, 0);
 		break;
 	default:
-		sBUG_ON(1);
+		sBUG();
 		break;
 	}
 	goto out_put;

scst/include/scst_debug.h

@@ -108,10 +108,12 @@
 #endif
 
 #ifdef CONFIG_SCST_EXTRACHECKS
+#define EXTRACHECKS_BUG()		sBUG()
 #define EXTRACHECKS_BUG_ON(a)		sBUG_ON(a)
 #define EXTRACHECKS_WARN_ON(a)		WARN_ON(a)
 #define EXTRACHECKS_WARN_ON_ONCE(a)	WARN_ON_ONCE(a)
 #else
+#define EXTRACHECKS_BUG()		do { } while (0)
 #define EXTRACHECKS_BUG_ON(a)		do { } while (0)
 #define EXTRACHECKS_WARN_ON(a)		do { } while (0)
 #define EXTRACHECKS_WARN_ON_ONCE(a)	do { } while (0)

scst/src/dev_handlers/scst_user.c

@@ -1911,7 +1911,7 @@ again:
 					dev_user_unjam_cmd(u, 0, NULL);
 					goto again;
 				case UCMD_STATE_EXECING:
-					EXTRACHECKS_BUG_ON(1);
+					EXTRACHECKS_BUG();
 				}
 			}
 		}

scst/src/dev_handlers/scst_vdisk.c

@@ -1654,7 +1654,7 @@ static enum compl_status_e vdisk_exec_format_unit(struct vdisk_cmd_params *p)
 			}
 			break;
 		default:
-			sBUG_ON(1);
+			sBUG();
 			break;
 		}
 	}
@@ -3749,7 +3749,7 @@ static int vdisk_caching_pg(unsigned char *p, int pcontrol,
 		p[2] |= (virt_dev->wt_flag_saved || virt_dev->nv_cache) ? 0 : WCE;
 		break;
 	default:
-		sBUG_ON(1);
+		sBUG();
 		break;
 	}
 

scst/src/scst_lib.c

@@ -9413,7 +9413,7 @@ int scst_parse_descriptors(struct scst_cmd *cmd)
 		res = scst_parse_unmap_descriptors(cmd);
 		break;
 	default:
-		sBUG_ON(1);
+		sBUG();
 		res = -1;
 		break;
 	}
@@ -9431,7 +9431,7 @@ static void scst_free_descriptors(struct scst_cmd *cmd)
 		scst_free_unmap_descriptors(cmd);
 		break;
 	default:
-		sBUG_ON(1);
+		sBUG();
 		break;
 	}
 

scst/src/scst_targ.c

@@ -2288,7 +2288,7 @@ static int scst_report_supported_opcodes(struct scst_cmd *cmd)
 		}
 		break;
 	default:
-		sBUG_ON(1);
+		sBUG();
 		goto out_compl;
 	}