tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'block-5.7-2020-05-01' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
"A few fixes for this release:

- NVMe pull request from Christoph, with a single fix for a double
free in the namespace error handling.

- Kill the bd_openers check in blk_drop_partitions(), fixing a
regression in this merge window (Christoph)"

* tag 'block-5.7-2020-05-01' of git://git.kernel.dk/linux-block:
block: remove the bd_openers checks in blk_drop_partitions
nvme: prevent double free in nvme_alloc_ns() error handling

Linus Torvalds 052c467c ab386c46

+3 -1
+1 -1
block/partitions/core.c
··· 496 496 497 497 if (!disk_part_scan_enabled(disk)) 498 498 return 0; 499 - if (bdev->bd_part_count || bdev->bd_openers > 1) 499 + if (bdev->bd_part_count) 500 500 return -EBUSY; 501 501 res = invalidate_partition(disk, 0); 502 502 if (res)
+2
drivers/nvme/host/core.c
··· 3642 3642 3643 3643 return; 3644 3644 out_put_disk: 3645 + /* prevent double queue cleanup */ 3646 + ns->disk->queue = NULL; 3645 3647 put_disk(ns->disk); 3646 3648 out_unlink_ns: 3647 3649 mutex_lock(&ctrl->subsys->lock);