Commit 7fef2edf authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

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: 7c3f828b ("block: refactor device number setup in __device_add_disk")
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 79789db0

drivers/scsi/sd.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -98,11 +98,7 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_MOD); 
MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);

MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);

MODULE_ALIAS_SCSI_DEVICE(TYPE_ZBC);

MODULE_ALIAS_SCSI_DEVICE(TYPE_ZBC);





#if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)

#define SD_MINORS	16

#define SD_MINORS	16

#else

#define SD_MINORS	0

#endif





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

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

static void sd_config_write_same(struct scsi_disk *);

static void sd_config_write_same(struct scsi_disk *);