Commit 41463f2d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

dasd: cleamup dasd_state_basic_to_ready 



Reflow dasd_state_basic_to_ready a bit to make it easier to modify.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarStefan Haberland <sth@linux.ibm.com>
Link: https://lore.kernel.org/r/20240228133742.806274-2-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 38b43539

drivers/s390/block/dasd.c

+26 −28
Original line number Diff line number Diff line
@@ -307,39 +307,37 @@ static int dasd_state_basic_to_known(struct dasd_device *device) 
 */

static int dasd_state_basic_to_ready(struct dasd_device *device)

{

	int rc;

	struct dasd_block *block;

	struct gendisk *disk;

	struct dasd_block *block = device->block;

	int rc = 0;



	rc = 0;

	block = device->block;

	/* make disk known with correct capacity */

	if (block) {

	if (!block) {

		device->state = DASD_STATE_READY;

		goto out;

	}



	if (block->base->discipline->do_analysis != NULL)

		rc = block->base->discipline->do_analysis(block);

	if (rc) {

			if (rc != -EAGAIN) {

		if (rc == -EAGAIN)

			return rc;

		device->state = DASD_STATE_UNFMT;

				disk = device->block->gdp;

				kobject_uevent(&disk_to_dev(disk)->kobj,

		kobject_uevent(&disk_to_dev(device->block->gdp)->kobj,

			       KOBJ_CHANGE);

		goto out;

	}

			return rc;

		}



	if (device->discipline->setup_blk_queue)

		device->discipline->setup_blk_queue(block);

		set_capacity(block->gdp,

			     block->blocks << block->s2b_shift);

	set_capacity(block->gdp, block->blocks << block->s2b_shift);

	device->state = DASD_STATE_READY;



	rc = dasd_scan_partitions(block);

	if (rc) {

		device->state = DASD_STATE_BASIC;

		return rc;

	}

	} else {

		device->state = DASD_STATE_READY;

	}



out:

	if (device->discipline->basic_to_ready)

		rc = device->discipline->basic_to_ready(device);