From aa02a1c9a89a23d07675114a9a017e565a38174a Mon Sep 17 00:00:00 2001
From: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Date: Fri, 11 Sep 2009 10:29:02 +0200
Subject: [PATCH] --- yaml --- r: 157475 b: refs/heads/master c:
 53f8c573ea3b54b7e1b81d2cd403373b08103736 h: refs/heads/master i:   157473:
 d1c8a384a371ced38ddafd00c4f20d2bba8c08cc   157471:
 0494513f7c5e33b8e96e998df4b23cde06aa7c35 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/s390/char/tape_block.c |  4 ++--
 trunk/drivers/s390/char/tape_core.c  | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9568bb8b5722..ab3ec68879ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ddddf3e0a55a7fcd6f240a7416cfcb12dd38b7e
+refs/heads/master: 53f8c573ea3b54b7e1b81d2cd403373b08103736
diff --git a/trunk/drivers/s390/char/tape_block.c b/trunk/drivers/s390/char/tape_block.c
index 47ff695255ea..1c2a582e626c 100644
--- a/trunk/drivers/s390/char/tape_block.c
+++ b/trunk/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/trunk/drivers/s390/char/tape_core.c b/trunk/drivers/s390/char/tape_core.c
index 7424d648e81f..934a42ebe11f 100644
--- a/trunk/drivers/s390/char/tape_core.c
+++ b/trunk/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