Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 157475
b: refs/heads/master
c: 53f8c57
h: refs/heads/master
i:
  157473: d1c8a38
  157471: 0494513
v: v3
  • Loading branch information
Michael Holzheu authored and Martin Schwidefsky committed Sep 11, 2009
1 parent 4de99ab commit aa02a1c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ddddf3e0a55a7fcd6f240a7416cfcb12dd38b7e
refs/heads/master: 53f8c573ea3b54b7e1b81d2cd403373b08103736
4 changes: 2 additions & 2 deletions trunk/drivers/s390/char/tape_block.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
10 changes: 6 additions & 4 deletions trunk/drivers/s390/char/tape_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit aa02a1c

Please sign in to comment.