adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

qnx4fs: add missing KERN_xxx to printk() calls

Browse source 
fixed printk calls to consistently specify a KERN_xxx level.

Signed-off-by: Anders Larsen <al@alarsen.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Anders Larsen 2009-09-26 20:15:09 +02:00 committed by Jiri Kosina
parent e0c0978699
commit 891ddb95d0
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/qnx4/bitmap.c
View file

@ -67,7 +67,7 @@ unsigned long qnx4_count_free_blocks(struct super_block *sb)
while (total < size) { while (total < size) {
if ((bh = sb_bread(sb, start + offset)) == NULL) { if ((bh = sb_bread(sb, start + offset)) == NULL) {
printk("qnx4: I/O error in counting free blocks\n"); printk(KERN_ERR "qnx4: I/O error in counting free blocks\n");
break; break;
} }
count_bits(bh->b_data, size - total, &total_free); count_bits(bh->b_data, size - total, &total_free);

6
fs/qnx4/dir.c
View file

@ -26,8 +26,8 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir)
int ix, ino; int ix, ino;
int size; int size;
QNX4DEBUG(("qnx4_readdir:i_size = %ld\n", (long) inode->i_size)); QNX4DEBUG((KERN_INFO "qnx4_readdir:i_size = %ld\n", (long) inode->i_size));
QNX4DEBUG(("filp->f_pos = %ld\n", (long) filp->f_pos)); QNX4DEBUG((KERN_INFO "filp->f_pos = %ld\n", (long) filp->f_pos));
lock_kernel(); lock_kernel();
@ -50,7 +50,7 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir)
size = QNX4_NAME_MAX; size = QNX4_NAME_MAX;
if ( ( de->di_status & (QNX4_FILE_USED|QNX4_FILE_LINK) ) != 0 ) { if ( ( de->di_status & (QNX4_FILE_USED|QNX4_FILE_LINK) ) != 0 ) {
QNX4DEBUG(("qnx4_readdir:%.*s\n", size, de->di_fname)); QNX4DEBUG((KERN_INFO "qnx4_readdir:%.*s\n", size, de->di_fname));
if ( ( de->di_status & QNX4_FILE_LINK ) == 0 ) if ( ( de->di_status & QNX4_FILE_LINK ) == 0 )
ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1; ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1;
else { else {

26
fs/qnx4/inode.c
View file

@ -107,7 +107,7 @@ static int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_h
{ {
unsigned long phys; unsigned long phys;
QNX4DEBUG(("qnx4: qnx4_get_block inode=[%ld] iblock=[%ld]\n",inode->i_ino,iblock)); QNX4DEBUG((KERN_INFO "qnx4: qnx4_get_block inode=[%ld] iblock=[%ld]\n",inode->i_ino,iblock));
phys = qnx4_block_map( inode, iblock ); phys = qnx4_block_map( inode, iblock );
if ( phys ) { if ( phys ) {
@ -142,12 +142,12 @@ unsigned long qnx4_block_map( struct inode *inode, long iblock )
// read next xtnt block. // read next xtnt block.
bh = sb_bread(inode->i_sb, i_xblk - 1); bh = sb_bread(inode->i_sb, i_xblk - 1);
if ( !bh ) { if ( !bh ) {
QNX4DEBUG(("qnx4: I/O error reading xtnt block [%ld])\n", i_xblk - 1)); QNX4DEBUG((KERN_ERR "qnx4: I/O error reading xtnt block [%ld])\n", i_xblk - 1));
return -EIO; return -EIO;
} }
xblk = (struct qnx4_xblk*)bh->b_data; xblk = (struct qnx4_xblk*)bh->b_data;
if ( memcmp( xblk->xblk_signature, "IamXblk", 7 ) ) { if ( memcmp( xblk->xblk_signature, "IamXblk", 7 ) ) {
QNX4DEBUG(("qnx4: block at %ld is not a valid xtnt\n", qnx4_inode->i_xblk)); QNX4DEBUG((KERN_ERR "qnx4: block at %ld is not a valid xtnt\n", qnx4_inode->i_xblk));
return -EIO; return -EIO;
} }
} }
@ -168,7 +168,7 @@ unsigned long qnx4_block_map( struct inode *inode, long iblock )
brelse( bh ); brelse( bh );
} }
QNX4DEBUG(("qnx4: mapping block %ld of inode %ld = %ld\n",iblock,inode->i_ino,block)); QNX4DEBUG((KERN_INFO "qnx4: mapping block %ld of inode %ld = %ld\n",iblock,inode->i_ino,block));
return block; return block;
} }
@ -209,7 +209,7 @@ static const char *qnx4_checkroot(struct super_block *sb)
if (*(qnx4_sb(sb)->sb->RootDir.di_fname) != '/') { if (*(qnx4_sb(sb)->sb->RootDir.di_fname) != '/') {
return "no qnx4 filesystem (no root dir)."; return "no qnx4 filesystem (no root dir).";
} else { } else {
QNX4DEBUG(("QNX4 filesystem found on dev %s.\n", sb->s_id)); QNX4DEBUG((KERN_NOTICE "QNX4 filesystem found on dev %s.\n", sb->s_id));
rd = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_blk) - 1; rd = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_blk) - 1;
rl = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_size); rl = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_size);
for (j = 0; j < rl; j++) { for (j = 0; j < rl; j++) {
@ -220,7 +220,7 @@ static const char *qnx4_checkroot(struct super_block *sb)
for (i = 0; i < QNX4_INODES_PER_BLOCK; i++) { for (i = 0; i < QNX4_INODES_PER_BLOCK; i++) {
rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE); rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE);
if (rootdir->di_fname != NULL) { if (rootdir->di_fname != NULL) {
QNX4DEBUG(("Rootdir entry found : [%s]\n", rootdir->di_fname)); QNX4DEBUG((KERN_INFO "rootdir entry found : [%s]\n", rootdir->di_fname));
if (!strncmp(rootdir->di_fname, QNX4_BMNAME, sizeof QNX4_BMNAME)) { if (!strncmp(rootdir->di_fname, QNX4_BMNAME, sizeof QNX4_BMNAME)) {
found = 1; found = 1;
qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL ); qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL );
@ -265,12 +265,12 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent)
if we don't belong here... */ if we don't belong here... */
bh = sb_bread(s, 1); bh = sb_bread(s, 1);
if (!bh) { if (!bh) {
printk("qnx4: unable to read the superblock\n"); printk(KERN_ERR "qnx4: unable to read the superblock\n");
goto outnobh; goto outnobh;
} }
if ( le32_to_cpup((__le32*) bh->b_data) != QNX4_SUPER_MAGIC ) { if ( le32_to_cpup((__le32*) bh->b_data) != QNX4_SUPER_MAGIC ) {
if (!silent) if (!silent)
printk("qnx4: wrong fsid in superblock.\n"); printk(KERN_ERR "qnx4: wrong fsid in superblock.\n");
goto out; goto out;
} }
s->s_op = &qnx4_sops; s->s_op = &qnx4_sops;
@ -284,14 +284,14 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent)
errmsg = qnx4_checkroot(s); errmsg = qnx4_checkroot(s);
if (errmsg != NULL) { if (errmsg != NULL) {
if (!silent) if (!silent)
printk("qnx4: %s\n", errmsg); printk(KERN_ERR "qnx4: %s\n", errmsg);
goto out; goto out;
} }
/* does root not have inode number QNX4_ROOT_INO ?? */ /* does root not have inode number QNX4_ROOT_INO ?? */
root = qnx4_iget(s, QNX4_ROOT_INO * QNX4_INODES_PER_BLOCK); root = qnx4_iget(s, QNX4_ROOT_INO * QNX4_INODES_PER_BLOCK);
if (IS_ERR(root)) { if (IS_ERR(root)) {
printk("qnx4: get inode failed\n"); printk(KERN_ERR "qnx4: get inode failed\n");
ret = PTR_ERR(root); ret = PTR_ERR(root);
goto out; goto out;
} }
@ -374,7 +374,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino)
qnx4_inode = qnx4_raw_inode(inode); qnx4_inode = qnx4_raw_inode(inode);
inode->i_mode = 0; inode->i_mode = 0;
QNX4DEBUG(("Reading inode : [%d]\n", ino)); QNX4DEBUG((KERN_INFO "reading inode : [%d]\n", ino));
if (!ino) { if (!ino) {
printk(KERN_ERR "qnx4: bad inode number on dev %s: %lu is " printk(KERN_ERR "qnx4: bad inode number on dev %s: %lu is "
"out of range\n", "out of range\n",
@ -385,7 +385,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino)
block = ino / QNX4_INODES_PER_BLOCK; block = ino / QNX4_INODES_PER_BLOCK;
if (!(bh = sb_bread(sb, block))) { if (!(bh = sb_bread(sb, block))) {
printk("qnx4: major problem: unable to read inode from dev " printk(KERN_ERR "qnx4: major problem: unable to read inode from dev "
"%s\n", sb->s_id); "%s\n", sb->s_id);
iget_failed(inode); iget_failed(inode);
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
@ -499,7 +499,7 @@ static int __init init_qnx4_fs(void)
return err; return err;
} }
printk("QNX4 filesystem 0.2.3 registered.\n"); printk(KERN_INFO "QNX4 filesystem 0.2.3 registered.\n");
return 0; return 0;
} }

6
fs/qnx4/namei.c
View file

@ -30,7 +30,7 @@ static int qnx4_match(int len, const char *name,
int namelen, thislen; int namelen, thislen;
if (bh == NULL) { if (bh == NULL) {
printk("qnx4: matching unassigned buffer !\n"); printk(KERN_WARNING "qnx4: matching unassigned buffer !\n");
return 0; return 0;
} }
de = (struct qnx4_inode_entry *) (bh->b_data + *offset); de = (struct qnx4_inode_entry *) (bh->b_data + *offset);
@ -66,7 +66,7 @@ static struct buffer_head *qnx4_find_entry(int len, struct inode *dir,
*res_dir = NULL; *res_dir = NULL;
if (!dir->i_sb) { if (!dir->i_sb) {
printk("qnx4: no superblock on dir.\n"); printk(KERN_WARNING "qnx4: no superblock on dir.\n");
return NULL; return NULL;
} }
bh = NULL; bh = NULL;
@ -124,7 +124,7 @@ struct dentry * qnx4_lookup(struct inode *dir, struct dentry *dentry, struct nam
foundinode = qnx4_iget(dir->i_sb, ino); foundinode = qnx4_iget(dir->i_sb, ino);
if (IS_ERR(foundinode)) { if (IS_ERR(foundinode)) {
unlock_kernel(); unlock_kernel();
QNX4DEBUG(("qnx4: lookup->iget -> error %ld\n", QNX4DEBUG((KERN_ERR "qnx4: lookup->iget -> error %ld\n",
PTR_ERR(foundinode))); PTR_ERR(foundinode)));
return ERR_CAST(foundinode); return ERR_CAST(foundinode);
} }