Skip to content

L
linux
Commit 66b47029 authored by Kai Mäkisara's avatar Kai Mäkisara Committed by James Bottomley
Browse files
Options

[PATCH] SCSI tape log message fixes 

This patch changes the st console/log messages:

- __GFP_NOWARN added to buffer allocation to suppress useless messages
  when having to use smaller than default segments
- move log message from enlarge_buffer() to caller so that the tape name
  can be printed and remove some debugging messages; now the st messages
  should include drive name where applicable (a problem reported by
  Hironobu Ishii)
- setting options is logged only when debugging; the most important
  options are now seen in sysfs
parent 3a353fb0
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 66 deletions
drivers/scsi/st.c
View file @ 66b47029
......@@ -17,7 +17,7 @@
Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
*/
static char *verstr = "20040318";
static char *verstr = "20040403";
#include <linux/module.h>
......@@ -1031,7 +1031,8 @@ static int st_open(struct inode *inode, struct file *filp)
/* See that we have at least a one page buffer available */
if (!enlarge_buffer(STp->buffer, PAGE_SIZE, STp->restr_dma)) {
printk(KERN_WARNING "%s: Can't allocate tape buffer.\n", name);
printk(KERN_WARNING "%s: Can't allocate one page tape buffer.\n",
name);
retval = (-EOVERFLOW);
goto err_out;
}
......@@ -1318,6 +1319,8 @@ static int setup_buffering(Scsi_Tape *STp, const char *buf, size_t count, int is
bufsize = count;
if (bufsize > STbp->buffer_size &&
!enlarge_buffer(STbp, bufsize, STp->restr_dma)) {
printk(KERN_WARNING "%s: Can't allocate %d byte tape buffer.\n",
tape_name(STp), bufsize);
retval = (-EOVERFLOW);
goto out;
}
......@@ -1960,9 +1963,11 @@ static ssize_t
DEB(
/* Set the driver options */
static void st_log_options(Scsi_Tape * STp, ST_mode * STm, char *name)
{
if (debugging) {
printk(KERN_INFO
"%s: Mode %d options: buffer writes: %d, async writes: %d, read ahead: %d\n",
name, STp->current_mode, STm->do_buffer_writes, STm->do_async_writes,
......@@ -1976,10 +1981,11 @@ static void st_log_options(Scsi_Tape * STp, ST_mode * STm, char *name)
STp->scsi2_logical);
printk(KERN_INFO
"%s: sysv: %d nowait: %d\n", name, STm->sysv, STp->immediate);
DEB(printk(KERN_INFO
"%s: debugging: %d\n",
name, debugging);)
printk(KERN_INFO "%s: debugging: %d\n",
name, debugging);
}
}
)
static int st_set_options(Scsi_Tape *STp, long options)
......@@ -2017,8 +2023,8 @@ static int st_set_options(Scsi_Tape *STp, long options)
STp->scsi2_logical = (options & MT_ST_SCSI2LOGICAL) != 0;
STp->immediate = (options & MT_ST_NOWAIT) != 0;
STm->sysv = (options & MT_ST_SYSV) != 0;
DEB( debugging = (options & MT_ST_DEBUGGING) != 0; )
st_log_options(STp, STm, name);
DEB( debugging = (options & MT_ST_DEBUGGING) != 0;
st_log_options(STp, STm, name); )
} else if (code == MT_ST_SETBOOLEANS || code == MT_ST_CLEARBOOLEANS) {
value = (code == MT_ST_SETBOOLEANS);
if ((options & MT_ST_BUFFER_WRITES) != 0)
......@@ -2050,19 +2056,19 @@ static int st_set_options(Scsi_Tape *STp, long options)
STm->sysv = value;
DEB(
if ((options & MT_ST_DEBUGGING) != 0)
debugging = value; )
st_log_options(STp, STm, name);
debugging = value;
st_log_options(STp, STm, name); )
} else if (code == MT_ST_WRITE_THRESHOLD) {
/* Retained for compatibility */
} else if (code == MT_ST_DEF_BLKSIZE) {
value = (options & ~MT_ST_OPTIONS);
if (value == ~MT_ST_OPTIONS) {
STm->default_blksize = (-1);
printk(KERN_INFO "%s: Default block size disabled.\n", name);
DEBC( printk(KERN_INFO "%s: Default block size disabled.\n", name));
} else {
STm->default_blksize = value;
printk(KERN_INFO "%s: Default block size set to %d bytes.\n",
name, STm->default_blksize);
DEBC( printk(KERN_INFO "%s: Default block size set to %d bytes.\n",
name, STm->default_blksize));
if (STp->ready == ST_READY) {
STp->blksize_changed = FALSE;
set_mode_densblk(STp, STm);
......@@ -2072,12 +2078,12 @@ static int st_set_options(Scsi_Tape *STp, long options)
value = (options & ~MT_ST_OPTIONS);
if ((value & MT_ST_SET_LONG_TIMEOUT) != 0) {
STp->long_timeout = (value & ~MT_ST_SET_LONG_TIMEOUT) * HZ;
printk(KERN_INFO "%s: Long timeout set to %d seconds.\n", name,
(value & ~MT_ST_SET_LONG_TIMEOUT));
DEBC( printk(KERN_INFO "%s: Long timeout set to %d seconds.\n", name,
(value & ~MT_ST_SET_LONG_TIMEOUT)));
} else {
STp->timeout = value * HZ;
printk(KERN_INFO "%s: Normal timeout set to %d seconds.\n",
name, value);
DEBC( printk(KERN_INFO "%s: Normal timeout set to %d seconds.\n",
name, value) );
}
} else if (code == MT_ST_SET_CLN) {
value = (options & ~MT_ST_OPTIONS) & 0xff;
......@@ -2096,12 +2102,12 @@ static int st_set_options(Scsi_Tape *STp, long options)
if (code == MT_ST_DEF_DENSITY) {
if (value == MT_ST_CLEAR_DEFAULT) {
STm->default_density = (-1);
printk(KERN_INFO "%s: Density default disabled.\n",
name);
DEBC( printk(KERN_INFO "%s: Density default disabled.\n",
name));
} else {
STm->default_density = value & 0xff;
printk(KERN_INFO "%s: Density default set to %x\n",
name, STm->default_density);
DEBC( printk(KERN_INFO "%s: Density default set to %x\n",
name, STm->default_density));
if (STp->ready == ST_READY) {
STp->density_changed = FALSE;
set_mode_densblk(STp, STm);
......@@ -2110,31 +2116,31 @@ static int st_set_options(Scsi_Tape *STp, long options)
} else if (code == MT_ST_DEF_DRVBUFFER) {
if (value == MT_ST_CLEAR_DEFAULT) {
STp->default_drvbuffer = 0xff;
printk(KERN_INFO
"%s: Drive buffer default disabled.\n", name);
DEBC( printk(KERN_INFO
"%s: Drive buffer default disabled.\n", name));
} else {
STp->default_drvbuffer = value & 7;
printk(KERN_INFO
DEBC( printk(KERN_INFO
"%s: Drive buffer default set to %x\n",
name, STp->default_drvbuffer);
name, STp->default_drvbuffer));
if (STp->ready == ST_READY)
st_int_ioctl(STp, MTSETDRVBUFFER, STp->default_drvbuffer);
}
} else if (code == MT_ST_DEF_COMPRESSION) {
if (value == MT_ST_CLEAR_DEFAULT) {
STm->default_compression = ST_DONT_TOUCH;
printk(KERN_INFO
"%s: Compression default disabled.\n", name);
DEBC( printk(KERN_INFO
"%s: Compression default disabled.\n", name));
} else {
if ((value & 0xff00) != 0) {
STp->c_algo = (value & 0xff00) >> 8;
printk(KERN_INFO "%s: Compression algorithm set to 0x%x.\n",
name, STp->c_algo);
DEBC( printk(KERN_INFO "%s: Compression algorithm set to 0x%x.\n",
name, STp->c_algo));
}
if ((value & 0xff) != 0xff) {
STm->default_compression = (value & 1 ? ST_YES : ST_NO);
printk(KERN_INFO "%s: Compression default set to %x\n",
name, (value & 1));
DEBC( printk(KERN_INFO "%s: Compression default set to %x\n",
name, (value & 1)));
if (STp->ready == ST_READY) {
STp->compression_changed = FALSE;
st_compression(STp, (STm->default_compression == ST_YES));
......@@ -3465,7 +3471,7 @@ static int enlarge_buffer(ST_buffer * STbuffer, int new_size, int need_dma)
if (nbr <= 0)
return FALSE;
priority = GFP_KERNEL;
priority = GFP_KERNEL | __GFP_NOWARN;
if (need_dma)
priority |= GFP_DMA;
for (b_size = PAGE_SIZE, order=0;
......@@ -3482,8 +3488,6 @@ static int enlarge_buffer(ST_buffer * STbuffer, int new_size, int need_dma)
order--;
continue;
}
printk(KERN_NOTICE "st: failed to enlarge buffer to %d bytes.\n",
new_size);
DEB(STbuffer->buffer_size = got);
normalize_buffer(STbuffer);
return FALSE;
......@@ -3495,9 +3499,6 @@ static int enlarge_buffer(ST_buffer * STbuffer, int new_size, int need_dma)
segs++;
}
STbuffer->b_data = page_address(STbuffer->frp[0].page);
DEBC(printk(ST_DEB_MSG
"st: Succeeded to enlarge buffer at %p to %d bytes (segs %d->%d, %d).\n",
STbuffer, got, STbuffer->orig_frp_segs, STbuffer->frp_segs, b_size));
return TRUE;
}
......@@ -3513,11 +3514,6 @@ static void normalize_buffer(ST_buffer * STbuffer)
__free_pages(STbuffer->frp[i].page, order);
STbuffer->buffer_size -= STbuffer->frp[i].length;
}
DEB(
if (debugging && STbuffer->orig_frp_segs < STbuffer->frp_segs)
printk(ST_DEB_MSG "st: Buffer at %p normalized to %d bytes (segs %d->%d).\n",
STbuffer, STbuffer->buffer_size, STbuffer->frp_segs, STbuffer->orig_frp_segs);
) /* end DEB */
STbuffer->frp_segs = STbuffer->orig_frp_segs;
STbuffer->frp_sg_current = 0;
}
......@@ -3547,11 +3543,9 @@ static int append_to_buffer(const char *ubp, ST_buffer * st_bp, int do_count)
ubp += cnt;
offset = 0;
}
if (do_count) { /* Should never happen */
printk(KERN_WARNING "st: append_to_buffer overflow (left %d).\n",
do_count);
if (do_count) /* Should never happen */
return (-EIO);
}
return 0;
}
......@@ -3581,11 +3575,9 @@ static int from_buffer(ST_buffer * st_bp, char *ubp, int do_count)
ubp += cnt;
offset = 0;
}
if (do_count) { /* Should never happen */
printk(KERN_WARNING "st: from_buffer overflow (left %d).\n",
do_count);
if (do_count) /* Should never happen */
return (-EIO);
}
return 0;
}
......@@ -3606,10 +3598,6 @@ static void move_buffer_data(ST_buffer * st_bp, int offset)
break;
offset -= st_bp->frp[src_seg].length;
}
if (src_seg == st_bp->frp_segs) { /* Should never happen */
printk(KERN_WARNING "st: move_buffer offset overflow.\n");
return;
}
st_bp->buffer_bytes = st_bp->read_pointer = total;
for (dst_seg=dst_offset=0; total > 0; ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7