Commit 490547ca authored Dec 02, 2019 by Eric Biggers Committed by Jens Axboe Dec 02, 2019

block: don't send uevent for empty disk when not invalidating



Commit 6917d068 ("block: merge invalidate_partitions into
rescan_partitions") caused a regression where systemd-udevd spins
forever using max CPU starting at boot time.

It's caused by a behavior change where a KOBJ_CHANGE uevent is now sent
in a case where previously it wasn't.

Restore the old behavior.

Fixes: 6917d068 ("block: merge invalidate_partitions into rescan_partitions")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 441cdbd5

fs/block_dev.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1531,7 +1531,7 @@ rescan:
	ret = blk_add_partitions(disk, bdev);		ret = blk_add_partitions(disk, bdev);
	if (ret == -EAGAIN)		if (ret == -EAGAIN)
	goto rescan;		goto rescan;
	} else {		} else if (invalidate) {
	/*		/*
	* Tell userspace that the media / partition table may have		* Tell userspace that the media / partition table may have
	* changed.		* changed.

Admin message