scsi: sd: remove unused sd_probe_types

CKI Pipelines Status: CKIOK

Blocking pipelines

Successful pipelines

These pipelines have been completed successfully or have been waived.

CKI_CentOSOK c10s_merge_request was successful.
~"CKI_Rawhide::OK" rawhide_merge_request was successful.
~"CKI_Rawhide_Debug::OK" rawhide_debug_merge_request was successful.
~"CKI_Rawhide_16k::OK" rawhide_16k_merge_request was successful.
~"CKI_Rawhide_16k_Debug::OK" rawhide_16k_debug_merge_request was successful.
~"CKI_Rawhide_Clang::OK" rawhide_clang_merge_request was successful.
~"CKI_Rawhide_Clang_Debug::OK" rawhide_clang_debug_merge_request was successful.
~"CKI_Rawhide_ClangLTO::OK" rawhide_clanglto_merge_request was successful.
~"CKI_Rawhide_ClangLTO_Debug::OK" rawhide_clanglto_debug_merge_request was successful.
CKI_RTOK c10s_realtime_merge_request was successful.
CKI_RT_DebugOK c10s_realtime_debug_merge_request was successful.
CKI_64kOK c10s_64k_merge_request was successful.
CKI_64k_DebugOK c10s_64k_debug_merge_request was successful.
CKI_DebugOK c10s_debug_merge_request was successful.
~"CKI_ELN::OK" eln_merge_request was successful.
~"CKI_ELN_Debug::OK" eln_debug_merge_request was successful.
~"CKI_ELN_64k::OK" eln_64k_merge_request was successful.
~"CKI_ELN_64k_Debug::OK" eln_64k_debug_merge_request was successful.
~"CKI_ELN_RT::OK" eln_realtime_merge_request was successful.
~"CKI_ELN_RT_Debug::OK" eln_realtime_debug_merge_request was successful.

Updated 2024-05-08 01:15 UTC by ckihook - CKI FAQ - Slack #team-kernel-cki - Source - Documentation - Report an issue

added CKIRunning CKI_64k_DebugRunning CKI_ARK_16kRunning CKI_DebugRunning CKI_RTRunning CKI_RT_DebugRunning labels and removed CKIMissing label

added CKI_64kRunning CKI_ARKRunning CKI_ARK_16k_DebugRunning CKI_ARK_ClangRunning CKI_ARK_ClangLTORunning CKI_ARK_ClangLTO_DebugRunning CKI_ARK_Clang_DebugRunning CKI_ARK_DebugRunning CKI_CentOSRunning labels and removed CKI_ARKMissing label

added MergeOK label

Mergeability Summary: MergeOK

This MR can be merged cleanly to its target branch.

Updated 2024-05-07 23:01 UTC by mergehook - KWF FAQ - Slack #team-kernel-workflow - Source - Documentation - Report an issue

removed CKI_64kRunning label

removed CKI_RT_DebugRunning label

removed CKI_RTRunning label

removed CKI_64k_DebugRunning label

removed CKI_ARKRunning CKI_CentOSRunning labels

removed CKI_ARK_16k_DebugRunning label

removed CKI_ARK_16kRunning label

removed CKI_ARK_DebugRunning label

removed CKI_ARK_ClangLTO_DebugRunning label

removed CKI_ARK_ClangRunning label

removed CKI_ARK_Clang_DebugRunning label

removed CKI_ARK_ClangLTORunning label

added CKIOK label and removed CKIRunning label

removed CKI_DebugRunning label

marked this merge request as ready

added DependenciesOK label

Affected subsystem(s): scsi_core

Requesting review of subsystem scsi_core with 0 required approval(s) from user(s) @thenzl @cleech @mlombard @e-milne

Created 2024-04-10 13:28 UTC by ack_nack - KWF FAQ - Slack #team-kernel-workflow - Source - Documentation - Report an issue

added AcksNeedsReview label

ACK/NACK Summary: AcksOK

Approved by:

Radu Rendec (rh-ee-rrendec)

Optional Approvals:

Approval Rule "scsi_core" requests optional ACK(s) from set (cleech, e-milne, mlombard, thenzl).

Merge Request has all necessary Approvals.

Updated 2024-05-08 14:59 UTC by ack_nack - KWF FAQ - Slack #team-kernel-workflow - Source - Documentation - Report an issue

requested review from @prarit

mentioned in merge request !3088 (merged)

approved this merge request

added AcksOK readyForMerge labels and removed AcksNeedsReview label

Shouldn't the commit have an Upstream Status: RHEL-only tag? Other than that, LGTM.

added Blocked label and removed readyForMerge label

added 1563 commits

2dd01576...fb3be880 - 1561 commits from branch cki-project:os-build
0130c722 - scsi: sd: remove unused sd_probe_types
4ab353ee - scsi: sd: condition probe_type under RHEL_DIFFERENCES

Compare with previous version

added CKIMissing CKI_RawhideMissing labels and removed CKIOK label

requested review from @acarmina

Approval(s) from @acarmina removed due to code changes, fresh approvals required on v2.

Click to show/hide v2 interdiff

Code changes in revision v2 of this MR:

--- old version
+++ new version
@@ -2,13 +2,32 @@
 index blahblah..blahblah 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
-@@ -119,8 +119,6 @@ static const char *sd_cache_types[] = {
+@@ -119,13 +119,13 @@ static const char *sd_cache_types[] = {
  	"write back, no read (daft)"
  };
  
 -static const char *sd_probe_types[] = { "async", "sync" };
 -
++#ifdef CONFIG_RHEL_DIFFERENCES
  static char sd_probe_type[6] = "async";
  module_param_string(probe, sd_probe_type, sizeof(sd_probe_type),
  		    S_IRUGO|S_IWUSR);
+ MODULE_PARM_DESC(probe, "async or sync. Setting to 'sync' disables asynchronous "
+ 		 "device number assignments (sda, sdb, ...).");
++#endif
+ 
+ static void sd_set_flush_flag(struct scsi_disk *sdkp)
+ {
+@@ -4257,8 +4257,11 @@ static int __init init_sd(void)
+ 		goto err_out_class;
+ 	}
+ 
++#ifdef CONFIG_RHEL_DIFFERENCES
+ 	if (!strcmp(sd_probe_type, "sync"))
+ 		sd_template.gendrv.probe_type = PROBE_FORCE_SYNCHRONOUS;
++#endif
++
+ 	err = scsi_register_driver(&sd_template.gendrv);
+ 	if (err)
+ 		goto err_out_driver;