Commit cec9cbac authored by Joe Perches's avatar Joe Perches Committed by Martin K. Petersen
Browse files

scsi: zfcp: use fallthrough; 

Convert the various uses of fallthrough comments to fallthrough;

Done via script
Link: https://lore.kernel.org/lkml/b56602fcf79f849e733e7b521bb0e17895d390fa.1582230379.git.joe.com/



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarFedor Loshakov <loshakov@linux.ibm.com>
Reviewed-by: default avatarSteffen Maier <maier@linux.ibm.com>
[bblock@linux.ibm.com: resolved merge conflict with recently upstream-sent patch "zfcp: expose fabric name as common fc_host sysfs attribute"]
Link: https://lore.kernel.org/r/d14669a67a17392490d3184117941123765db1a4.1585663010.git.bblock@linux.ibm.com


Signed-off-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4e6c78d1

drivers/s390/scsi/zfcp_erp.c

+5 −5
Original line number Diff line number Diff line
@@ -178,12 +178,12 @@ static enum zfcp_erp_act_type zfcp_erp_required_act(enum zfcp_erp_act_type want, 
			return 0;

		if (!(p_status & ZFCP_STATUS_COMMON_UNBLOCKED))

			need = ZFCP_ERP_ACTION_REOPEN_PORT;

		/* fall through */

		fallthrough;

	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:

		p_status = atomic_read(&port->status);

		if (!(p_status & ZFCP_STATUS_COMMON_OPEN))

			need = ZFCP_ERP_ACTION_REOPEN_PORT;

		/* fall through */

		fallthrough;

	case ZFCP_ERP_ACTION_REOPEN_PORT:

		p_status = atomic_read(&port->status);

		if (p_status & ZFCP_STATUS_COMMON_ERP_INUSE)
@@ -196,7 +196,7 @@ static enum zfcp_erp_act_type zfcp_erp_required_act(enum zfcp_erp_act_type want, 
			return need;

		if (!(a_status & ZFCP_STATUS_COMMON_UNBLOCKED))

			need = ZFCP_ERP_ACTION_REOPEN_ADAPTER;

		/* fall through */

		fallthrough;

	case ZFCP_ERP_ACTION_REOPEN_ADAPTER:

		a_status = atomic_read(&adapter->status);

		if (a_status & ZFCP_STATUS_COMMON_ERP_INUSE)
@@ -1086,7 +1086,7 @@ static enum zfcp_erp_act_result zfcp_erp_lun_strategy( 
		if (atomic_read(&zfcp_sdev->status) & ZFCP_STATUS_COMMON_OPEN)

			return zfcp_erp_lun_strategy_close(erp_action);

		/* already closed */

		/* fall through */

		fallthrough;

	case ZFCP_ERP_STEP_LUN_CLOSING:

		if (atomic_read(&zfcp_sdev->status) & ZFCP_STATUS_COMMON_OPEN)

			return ZFCP_ERP_FAILED;
@@ -1415,7 +1415,7 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, 
		if (act->step != ZFCP_ERP_STEP_UNINITIALIZED)

			if (result == ZFCP_ERP_SUCCEEDED)

				zfcp_erp_try_rport_unblock(port);

		/* fall through */

		fallthrough;

	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:

		put_device(&port->dev);

		break;

drivers/s390/scsi/zfcp_fsf.c

+11 −12
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req) 
	case FSF_TOPO_AL:

		fc_host_port_type(shost) = FC_PORTTYPE_NLPORT;

		fc_host_fabric_name(shost) = 0;

		/* fall through */

		fallthrough;

	default:

		fc_host_fabric_name(shost) = 0;

		dev_err(&adapter->ccw_device->dev,
@@ -1032,7 +1032,7 @@ static void zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *req) 
		switch (fsq->word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			zfcp_fc_test_link(zfcp_sdev->port);

			/* fall through */

			fallthrough;

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;

			break;
@@ -1127,7 +1127,7 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req) 
		break;

	case FSF_PORT_HANDLE_NOT_VALID:

		zfcp_erp_adapter_reopen(adapter, 0, "fsscth1");

		/* fall through */

		fallthrough;

	case FSF_GENERIC_COMMAND_REJECTED:

	case FSF_PAYLOAD_SIZE_MISMATCH:

	case FSF_REQUEST_SIZE_TOO_LARGE:
@@ -1313,7 +1313,7 @@ static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req) 
		break;

	case FSF_SBAL_MISMATCH:

		/* should never occur, avoided in zfcp_fsf_send_els */

		/* fall through */

		fallthrough;

	default:

		req->status |= ZFCP_STATUS_FSFREQ_ERROR;

		break;
@@ -1736,7 +1736,7 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req) 
		switch (header->fsf_status_qual.word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			/* no zfcp_fc_test_link() with failed open port */

			/* fall through */

			fallthrough;

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

		case FSF_SQ_NO_RETRY_POSSIBLE:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;
@@ -1909,14 +1909,14 @@ static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req) 
	case FSF_MAXIMUM_NUMBER_OF_PORTS_EXCEEDED:

		dev_warn(&req->adapter->ccw_device->dev,

			 "Opening WKA port 0x%x failed\n", wka_port->d_id);

		/* fall through */

		fallthrough;

	case FSF_ADAPTER_STATUS_AVAILABLE:

		req->status |= ZFCP_STATUS_FSFREQ_ERROR;

		wka_port->status = ZFCP_FC_WKA_PORT_OFFLINE;

		break;

	case FSF_GOOD:

		wka_port->handle = header->port_handle;

		/* fall through */

		fallthrough;

	case FSF_PORT_ALREADY_OPEN:

		wka_port->status = ZFCP_FC_WKA_PORT_ONLINE;

	}
@@ -2059,7 +2059,6 @@ static void zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *req) 
	case FSF_ADAPTER_STATUS_AVAILABLE:

		switch (header->fsf_status_qual.word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			/* fall through */

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;

			break;
@@ -2144,7 +2143,7 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req) 


	case FSF_PORT_HANDLE_NOT_VALID:

		zfcp_erp_adapter_reopen(adapter, 0, "fsouh_1");

		/* fall through */

		fallthrough;

	case FSF_LUN_ALREADY_OPEN:

		break;

	case FSF_PORT_BOXED:
@@ -2175,7 +2174,7 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req) 
			 (unsigned long long)zfcp_scsi_dev_lun(sdev),

			 (unsigned long long)zfcp_sdev->port->wwpn);

		zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ERP_FAILED);

		/* fall through */

		fallthrough;

	case FSF_INVALID_COMMAND_OPTION:

		req->status |= ZFCP_STATUS_FSFREQ_ERROR;

		break;
@@ -2183,7 +2182,7 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req) 
		switch (header->fsf_status_qual.word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			zfcp_fc_test_link(zfcp_sdev->port);

			/* fall through */

			fallthrough;

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;

			break;
@@ -2277,7 +2276,7 @@ static void zfcp_fsf_close_lun_handler(struct zfcp_fsf_req *req) 
		switch (req->qtcb->header.fsf_status_qual.word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			zfcp_fc_test_link(zfcp_sdev->port);

			/* fall through */

			fallthrough;

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE