Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53f8c573 authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky
Browse files

[S390] tape: Fix device online messages 



Currently, when a tape device is set online and no cartridge is loaded, we
get the messages "The tape cartridge has been successfully unloaded" and
"Determining the size of the recorded area". These messages are not correct.
To fix this, we now print the "cartridge loaded/unloaded" messages only,
when the load/unload event really occurs. In addition to that, the message
"Determining the size of the recorded area" is only printed, if a cartridge
is loaded.

Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2ddddf3e

drivers/s390/char/tape_block.c

+2 −2
Original line number Diff line number Diff line
@@ -302,8 +302,6 @@ tapeblock_revalidate_disk(struct gendisk *disk) 
	if (!device->blk_data.medium_changed)

		return 0;



	dev_info(&device->cdev->dev, "Determining the size of the recorded "

		"area...\n");

	rc = tape_mtop(device, MTFSFM, 1);

	if (rc)

		return rc;
@@ -312,6 +310,8 @@ tapeblock_revalidate_disk(struct gendisk *disk) 
	if (rc < 0)

		return rc;



	dev_info(&device->cdev->dev, "Determining the size of the recorded "

		"area...\n");

	DBF_LH(3, "Image file ends at %d\n", rc);

	nr_of_blks = rc;

drivers/s390/char/tape_core.c

+6 −4
Original line number Diff line number Diff line
@@ -214,13 +214,15 @@ tape_med_state_set(struct tape_device *device, enum tape_medium_state newstate) 
	switch(newstate){

	case MS_UNLOADED:

		device->tape_generic_status |= GMT_DR_OPEN(~0);

		dev_info(&device->cdev->dev, "The tape cartridge has been "

			"successfully unloaded\n");

		if (device->medium_state == MS_LOADED)

			dev_info(&device->cdev->dev, "The tape cartridge has "

				 "been successfully unloaded\n");

		break;

	case MS_LOADED:

		device->tape_generic_status &= ~GMT_DR_OPEN(~0);

		dev_info(&device->cdev->dev, "A tape cartridge has been "

			"mounted\n");

		if (device->medium_state == MS_UNLOADED)

			dev_info(&device->cdev->dev, "A tape cartridge has "

				 "been mounted\n");

		break;

	default:

		// print nothing