Skip to content

Commit 7fef2ed

Browse files
Christoph Hellwigtorvalds
authored andcommitted
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: 7c3f828 ("block: refactor device number setup in __device_add_disk") Reported-by: Guenter Roeck <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]> Tested-by: Guenter Roeck <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 79789db commit 7fef2ed

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/scsi/sd.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,7 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_MOD);
9898
MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);
9999
MODULE_ALIAS_SCSI_DEVICE(TYPE_ZBC);
100100

101-
#if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)
102101
#define SD_MINORS 16
103-
#else
104-
#define SD_MINORS 0
105-
#endif
106102

107103
static void sd_config_discard(struct scsi_disk *, unsigned int);
108104
static void sd_config_write_same(struct scsi_disk *);

0 commit comments

Comments
 (0)