Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42426
b: refs/heads/master
c: 4225285
h: refs/heads/master
v: v3
  • Loading branch information
Kai Makisara authored and James Bottomley committed Nov 15, 2006
1 parent 95d7886 commit 7c1784d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 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: fd44bab5c709bbcd30fbebe9ad45a76c58cd32a7
refs/heads/master: 42252854011b31fe63ffeca44ac941e6fe8277ae
16 changes: 8 additions & 8 deletions trunk/drivers/scsi/st.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
Steve Hirsch, Andreas Koppenh"ofer, Michael Leodolter, Eyal Lebedinsky,
Michael Schaefer, J"org Weule, and Eric Youngdale.
Copyright 1992 - 2005 Kai Makisara
Copyright 1992 - 2006 Kai Makisara
email Kai.Makisara@kolumbus.fi
Some small formal changes - aeb, 950809
Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
*/

static const char *verstr = "20050830";
static const char *verstr = "20061107";

#include <linux/module.h>

Expand Down Expand Up @@ -999,7 +999,7 @@ static int check_tape(struct scsi_tape *STp, struct file *filp)
STp->min_block = ((STp->buffer)->b_data[4] << 8) |
(STp->buffer)->b_data[5];
if ( DEB( debugging || ) !STp->inited)
printk(KERN_WARNING
printk(KERN_INFO
"%s: Block limits %d - %d bytes.\n", name,
STp->min_block, STp->max_block);
} else {
Expand Down Expand Up @@ -1221,7 +1221,7 @@ static int st_flush(struct file *filp, fl_owner_t id)
}

DEBC( if (STp->nbr_requests)
printk(KERN_WARNING "%s: Number of r/w requests %d, dio used in %d, pages %d (%d).\n",
printk(KERN_DEBUG "%s: Number of r/w requests %d, dio used in %d, pages %d (%d).\n",
name, STp->nbr_requests, STp->nbr_dio, STp->nbr_pages, STp->nbr_combinable));

if (STps->rw == ST_WRITING && !STp->pos_unknown) {
Expand Down Expand Up @@ -4053,11 +4053,11 @@ static int st_probe(struct device *dev)
goto out_free_tape;
}

sdev_printk(KERN_WARNING, SDp,
sdev_printk(KERN_NOTICE, SDp,
"Attached scsi tape %s\n", tape_name(tpnt));
printk(KERN_WARNING "%s: try direct i/o: %s (alignment %d B)\n",
tape_name(tpnt), tpnt->try_dio ? "yes" : "no",
queue_dma_alignment(SDp->request_queue) + 1);
sdev_printk(KERN_INFO, SDp, "%s: try direct i/o: %s (alignment %d B)\n",
tape_name(tpnt), tpnt->try_dio ? "yes" : "no",
queue_dma_alignment(SDp->request_queue) + 1);

return 0;

Expand Down

0 comments on commit 7c1784d

Please sign in to comment.