This is v3 series of the last patch set which should be considered once nvdimm/blk driver is removed, as Dan Williams noted it would be gone and once *all* add_disk() error handling patches have been merged. I rebased Tetsuo Handa's patch onto the latest linux-next as this series depends on it, and so I am sending it part of this series as without it, this won't apply. Tetsuo, does the rebase of your patch look OK? If it is not too much trouble, I'd like to ask for testing for the ataflop changes from Michael Schmitz, if possible, that is he'd just have to merge Tetsuo's rebased patch and the 2nd patch in this series. This is all rebased on linux-next tag 20211020. Changes in this v3: - we don't set ataflop registered to true when we fail, an issue spotted during review by Tetsuo - rebased to take into consideration Tetsuo's changes, both his old and the latest patch carried in this series - sets the floppy to null on failure from add_disk(), an issue spotted by Tetsuo during patch review - removes out label from ataflop as suggested by Finn Thain - we return the failure from floppy_alloc_disk as suggested by Finn Thain Luis Chamberlain (2): block: make __register_blkdev() return an error block: add __must_check for *add_disk*() callers Tetsuo Handa (1): ataflop: remove ataflop_probe_lock mutex block/bdev.c | 5 +++- block/genhd.c | 27 +++++++++++------ drivers/block/ataflop.c | 66 +++++++++++++++++++++++++---------------- drivers/block/brd.c | 7 +++-- drivers/block/floppy.c | 17 ++++++++--- drivers/block/loop.c | 11 +++++-- drivers/md/md.c | 12 ++++++-- drivers/scsi/sd.c | 3 +- include/linux/genhd.h | 10 +++---- 9 files changed, 105 insertions(+), 53 deletions(-) -- 2.30.2