Skip to contentSkip to conversation

sd: don't mess with SD_MINORS for CONFIG_DEBUG_BLOCK_EXT_DEVT

PATCH In review Christoph Hellwig 2 participants 2 messages Jul 12, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sd: don't mess with SD_MINORS for CONFIG_DEBUG_BLOCK_EXT_DEVT

No need to give up the original sd minor even with this option, and if we did we'd also need to fix the number of minors for this configuration to actually work.

Fixes 7c3f828b522b0 ("block: refactor device number setup in __device_add_disk")
---
 drivers/scsi/sd.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/scsi/sd.c +0 -4
index 6d2d63629a90..b8d55af763f9 100644
@@ -98,11 +98,7 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_MOD);
 MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);
 MODULE_ALIAS_SCSI_DEVICE(TYPE_ZBC);
 
-#if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)
 #define SD_MINORS	16
-#else
-#define SD_MINORS	0
-#endif
 
 static void sd_config_discard(struct scsi_disk *, unsigned int);
 static void sd_config_write_same(struct scsi_disk *);
Signature · 1 line
2.30.2
#1 lore raw
Quoted 3 lines · Christoph Hellwig

No need to give up the original sd minor even with this option, and if we did we'd also need to fix the number of minors for this configuration to actually work.

Linus just picked this up directly.