Merge branch 'svn-trunk'

scst/src/dev_handlers/scst_user.c

@@ -795,7 +795,7 @@ static int dev_user_parse(struct scst_cmd *cmd)
 			res = SCST_CMD_STATE_NEED_THREAD_CTX;
 			goto out;
 		}
-		/* else go through */
+		/* fall through */
 
 	case SCST_USER_PARSE_CALL:
 		TRACE_DBG("Preparing PARSE for user space (ucmd=%p, h=%d, "
@@ -1296,7 +1296,7 @@ out:
 out_nomem:
 	if (ucmd->cmd != NULL)
 		scst_set_busy(ucmd->cmd);
-	/* go through */
+	/* fall through */
 
 out_err:
 	if (ucmd->cmd != NULL)

scst/src/dev_handlers/scst_vdisk.c

@@ -2941,7 +2941,7 @@ static bool vdisk_use_zero_copy(const struct scst_cmd *cmd)
 	case VARIABLE_LENGTH_CMD:
 		if (cmd->cdb[9] != SUBCODE_READ_32)
 			break;
-		/* else go througth */
+		/* fall through */
 	case READ_6:
 	case READ_10:
 	case READ_12:

scst/src/scst_lib.c

@@ -3093,7 +3093,7 @@ int scst_get_cmd_abnormal_done_state(struct scst_cmd *cmd)
 			break;
 		}
 		trace = true;
-		/* go through */
+		/* fall through */
 	case SCST_CMD_STATE_DEV_DONE:
 		if (cmd->internal)
 			res = SCST_CMD_STATE_FINISHED_INTERNAL;
@@ -3127,7 +3127,8 @@ int scst_get_cmd_abnormal_done_state(struct scst_cmd *cmd)
 		if (cmd->preprocessing_only) {
 			res = SCST_CMD_STATE_PREPROCESSING_DONE;
 			break;
-		} /* else go through */
+		}
+		/* fall through */
 	case SCST_CMD_STATE_RDY_TO_XFER:
 	case SCST_CMD_STATE_DATA_WAIT:
 	case SCST_CMD_STATE_TGT_PRE_EXEC:
@@ -9442,7 +9443,7 @@ static int scst_do_dif(struct scst_cmd *cmd,
 	case SCST_DIF_CHECK_REF_TAG:
 	default:
 		EXTRACHECKS_BUG_ON(1);
-		/* go through */
+		/* fall through */
 	case SCST_DIF_ACTION_NONE:
 		/* Nothing to do */
 		TRACE_DBG("NONE DIF action, skipping (cmd %p)", cmd);
@@ -10694,7 +10695,7 @@ static int __scst_parse_vrprotect(struct scst_cmd *cmd, int vrprotect_offs)
 				cmd->cmd_dif_actions = 0;
 				break;
 			}
-			/* else go through */
+			/* fall through */
 		case 1:
 		case 5:
 			cmd->cmd_dif_actions = SCST_DIF_CHECK_GUARD_TAG |
@@ -13673,7 +13674,7 @@ static void scst_process_qerr(struct scst_cmd *cmd)
 	default:
 		PRINT_WARNING("Invalid QErr value %x for device %s, process as "
 			"0", qerr, dev->virt_name);
-		/* go through */
+		/* fall through */
 	case SCST_QERR_0_ALL_RESUME:
 		/* Nothing to do */
 		break;

scst/src/scst_targ.c

@@ -910,7 +910,7 @@ active:
 	default:
 		PRINT_ERROR("Context %x is undefined, using the thread one",
 			pref_context);
-		/* go through */
+		/* fall through */
 	case SCST_CONTEXT_THREAD:
 		spin_lock_irqsave(&cmd->cmd_threads->cmd_list_lock, flags);
 		TRACE_DBG("Adding cmd %p to active cmd list", cmd);
@@ -1360,7 +1360,7 @@ set_res:
 		TRACE_DBG_FLAG(TRACE_DEBUG|TRACE_MINOR, "Atomic context and "
 			"non-WRITE data direction, rescheduling (cmd %p)", cmd);
 		res = SCST_CMD_STATE_RES_NEED_THREAD;
-		/* go through */
+		/* fall through */
 	}
 #endif
 
@@ -1741,7 +1741,7 @@ void scst_restart_cmd(struct scst_cmd *cmd, int status,
 		set_bit(SCST_CMD_ABORTED, &cmd->cmd_flags);
 		set_bit(SCST_CMD_NO_RESP, &cmd->cmd_flags);
 		cmd->delivery_status = SCST_CMD_DELIVERY_FAILED;
-		/* go through */
+		/* fall through */
 	case SCST_PREPROCESS_STATUS_ERROR:
 		if (cmd->sense != NULL)
 			scst_set_cmd_error(cmd,
@@ -1913,7 +1913,7 @@ static void scst_process_redirect_cmd(struct scst_cmd *cmd,
 	default:
 		PRINT_ERROR("Context %x is unknown, using the thread one",
 			    context);
-		/* go through */
+		/* fall through */
 	case SCST_CONTEXT_THREAD:
 	{
 		struct list_head *active_cmd_list;
@@ -2015,7 +2015,7 @@ void scst_rx_data(struct scst_cmd *cmd, int status,
 		set_bit(SCST_CMD_ABORTED, &cmd->cmd_flags);
 		set_bit(SCST_CMD_NO_RESP, &cmd->cmd_flags);
 		cmd->delivery_status = SCST_CMD_DELIVERY_FAILED;
-		/* go through */
+		/* fall through */
 	case SCST_RX_STATUS_ERROR:
 		TRACE(TRACE_SCSI, "cmd %p, RX data error status %#x", cmd, status);
 		if (!cmd->write_not_received_set)
@@ -2149,7 +2149,7 @@ static int scst_tgt_pre_exec(struct scst_cmd *cmd)
 			set_bit(SCST_CMD_ABORTED, &cmd->cmd_flags);
 			set_bit(SCST_CMD_NO_RESP, &cmd->cmd_flags);
 			cmd->delivery_status = SCST_CMD_DELIVERY_FAILED;
-			/* go through */
+			/* fall through */
 		case SCST_PREPROCESS_STATUS_ERROR:
 			scst_set_cmd_error(cmd,
 				   SCST_LOAD_SENSE(scst_sense_hardw_error));
@@ -3846,7 +3846,7 @@ defer:
 				case SCST_QERR_3_ABORT_THIS_NEXUS_ONLY:
 					if (!this_nex)
 						goto defer;
-					/* else go through */
+					/* fall through */
 				case SCST_QERR_1_ABORT_ALL:
 					TRACE_MGMT_DBG("Aborting cmd %p due to "
 						"ACA active (tgt_dev %p)", cmd,