[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: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 47ff695255ea649f1f0296ed7f6f602ee1d4f9ac..1c2a582e626ce6058b316f1a9157a9646c736f49 100644 (file)
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -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;
 

diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 7424d648e81f1d4f04b60b6727365ad10c11dd7c..934a42ebe11f70d81cb7968202ffd419439ce774 100644 (file)
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -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