Merge tag 'block-5.7-2020-05-01' of git://git.kernel.dk/linux-block (052c467c) · Commits · 戴 / test

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

block/partitions/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -496,7 +496,7 @@ int blk_drop_partitions(struct gendisk disk, struct block_device bdev)

		if (!disk_part_scan_enabled(disk))
		return 0;
		if (bdev->bd_part_count \|\| bdev->bd_openers > 1)
		if (bdev->bd_part_count)
		return -EBUSY;
		res = invalidate_partition(disk, 0);
		if (res)

drivers/nvme/host/core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3642,6 +3642,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)

		return;
		out_put_disk:
		/* prevent double queue cleanup */
		ns->disk->queue = NULL;
		put_disk(ns->disk);
		out_unlink_ns:
		mutex_lock(&ctrl->subsys->lock);

Admin message