qnx4fs: add missing KERN_xxx to printk() calls

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>

qnx4fs: add missing KERN_xxx to printk() calls
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>
Anders Larsen · Jiri Kosina
1 parent e0c0978699
Showing 4 changed files with 20 additions and 20 deletions Side-by-side Diff
fs/qnx4/bitmap.c
fs/qnx4/dir.c
fs/qnx4/inode.c
fs/qnx4/namei.c
@@ -67,7 +67,7 @@
  
 	while (total < size) {
 		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;
 		}
 		count_bits(bh->b_data, size - total, &total_free);
@@ -26,8 +26,8 @@
 	int ix, ino;
 	int size;
  
-	QNX4DEBUG(("qnx4_readdir:i_size = %ld\n", (long) inode->i_size));
-	QNX4DEBUG(("filp->f_pos         = %ld\n", (long) filp->f_pos));
+	QNX4DEBUG((KERN_INFO "qnx4_readdir:i_size = %ld\n", (long) inode->i_size));
+	QNX4DEBUG((KERN_INFO "filp->f_pos         = %ld\n", (long) filp->f_pos));
  
 	lock_kernel();
  
@@ -50,7 +50,7 @@
 					size = QNX4_NAME_MAX;
  
 				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 )
 						ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1;
 					else {
@@ -107,7 +107,7 @@
 {
 	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 );
 	if ( phys ) {
  
@@ -142,12 +142,12 @@
 				// read next xtnt block.
 				bh = sb_bread(inode->i_sb, i_xblk - 1);
 				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;
 				}
 				xblk = (struct qnx4_xblk*)bh->b_data;
 				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;
 				}
 			}
@@ -168,7 +168,7 @@
 			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;
 }
  
@@ -209,7 +209,7 @@
 	if (*(qnx4_sb(sb)->sb->RootDir.di_fname) != '/') {
 		return "no qnx4 filesystem (no root dir).";
 	} 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;
 		rl = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_size);
 		for (j = 0; j < rl; j++) {
@@ -220,7 +220,7 @@
 			for (i = 0; i < QNX4_INODES_PER_BLOCK; i++) {
 				rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE);
 				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)) {
 						found = 1;
 						qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL );
  
@@ -265,12 +265,12 @@
 	   if we don't belong here... */
 	bh = sb_bread(s, 1);
 	if (!bh) {
-		printk("qnx4: unable to read the superblock\n");
+		printk(KERN_ERR "qnx4: unable to read the superblock\n");
 		goto outnobh;
 	}
 	if ( le32_to_cpup((__le32*) bh->b_data) != QNX4_SUPER_MAGIC ) {
 		if (!silent)
-			printk("qnx4: wrong fsid in superblock.\n");
+			printk(KERN_ERR "qnx4: wrong fsid in superblock.\n");
 		goto out;
 	}
 	s->s_op = &qnx4_sops;
  
@@ -284,14 +284,14 @@
 	errmsg = qnx4_checkroot(s);
 	if (errmsg != NULL) {
  		if (!silent)
- 			printk("qnx4: %s\n", errmsg);
+			printk(KERN_ERR "qnx4: %s\n", errmsg);
 		goto out;
 	}
  
  	/* does root not have inode number QNX4_ROOT_INO ?? */
 	root = qnx4_iget(s, QNX4_ROOT_INO * QNX4_INODES_PER_BLOCK);
 	if (IS_ERR(root)) {
- 		printk("qnx4: get inode failed\n");
+		printk(KERN_ERR "qnx4: get inode failed\n");
 		ret = PTR_ERR(root);
  		goto out;
  	}
@@ -374,7 +374,7 @@
 	qnx4_inode = qnx4_raw_inode(inode);
 	inode->i_mode = 0;
  
-	QNX4DEBUG(("Reading inode : [%d]\n", ino));
+	QNX4DEBUG((KERN_INFO "reading inode : [%d]\n", ino));
 	if (!ino) {
 		printk(KERN_ERR "qnx4: bad inode number on dev %s: %lu is "
 				"out of range\n",
@@ -385,7 +385,7 @@
 	block = ino / QNX4_INODES_PER_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);
 		iget_failed(inode);
 		return ERR_PTR(-EIO);
@@ -499,7 +499,7 @@
 		return err;
 	}
  
-	printk("QNX4 filesystem 0.2.3 registered.\n");
+	printk(KERN_INFO "QNX4 filesystem 0.2.3 registered.\n");
 	return 0;
 }
  
@@ -30,7 +30,7 @@
 	int namelen, thislen;
  
 	if (bh == NULL) {
-		printk("qnx4: matching unassigned buffer !\n");
+		printk(KERN_WARNING "qnx4: matching unassigned buffer !\n");
 		return 0;
 	}
 	de = (struct qnx4_inode_entry *) (bh->b_data + *offset);
@@ -66,7 +66,7 @@
  
 	*res_dir = NULL;
 	if (!dir->i_sb) {
-		printk("qnx4: no superblock on dir.\n");
+		printk(KERN_WARNING "qnx4: no superblock on dir.\n");
 		return NULL;
 	}
 	bh = NULL;
@@ -124,7 +124,7 @@
 	foundinode = qnx4_iget(dir->i_sb, ino);
 	if (IS_ERR(foundinode)) {
 		unlock_kernel();
-		QNX4DEBUG(("qnx4: lookup->iget -> error %ld\n",
+		QNX4DEBUG((KERN_ERR "qnx4: lookup->iget -> error %ld\n",
 			   PTR_ERR(foundinode)));
 		return ERR_CAST(foundinode);
 	}
...	...	@@ -67,7 +67,7 @@
67	67
68	68	while (total < size) {
69	69	if ((bh = sb_bread(sb, start + offset)) == NULL) {
70		- printk("qnx4: I/O error in counting free blocks\n");
	70	+ printk(KERN_ERR "qnx4: I/O error in counting free blocks\n");
71	71	break;
72	72	}
73	73	count_bits(bh->b_data, size - total, &total_free);
...	...	@@ -26,8 +26,8 @@
26	26	int ix, ino;
27	27	int size;
28	28
29		- QNX4DEBUG(("qnx4_readdir:i_size = %ld\n", (long) inode->i_size));
30		- QNX4DEBUG(("filp->f_pos = %ld\n", (long) filp->f_pos));
	29	+ QNX4DEBUG((KERN_INFO "qnx4_readdir:i_size = %ld\n", (long) inode->i_size));
	30	+ QNX4DEBUG((KERN_INFO "filp->f_pos = %ld\n", (long) filp->f_pos));
31	31
32	32	lock_kernel();
33	33
...	...	@@ -50,7 +50,7 @@
50	50	size = QNX4_NAME_MAX;
51	51
52	52	if ( ( de->di_status & (QNX4_FILE_USED\|QNX4_FILE_LINK) ) != 0 ) {
53		- QNX4DEBUG(("qnx4_readdir:%.*s\n", size, de->di_fname));
	53	+ QNX4DEBUG((KERN_INFO "qnx4_readdir:%.*s\n", size, de->di_fname));
54	54	if ( ( de->di_status & QNX4_FILE_LINK ) == 0 )
55	55	ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1;
56	56	else {
...	...	@@ -107,7 +107,7 @@
107	107	{
108	108	unsigned long phys;
109	109
110		- QNX4DEBUG(("qnx4: qnx4_get_block inode=[%ld] iblock=[%ld]\n",inode->i_ino,iblock));
	110	+ QNX4DEBUG((KERN_INFO "qnx4: qnx4_get_block inode=[%ld] iblock=[%ld]\n",inode->i_ino,iblock));
111	111
112	112	phys = qnx4_block_map( inode, iblock );
113	113	if ( phys ) {
114	114
...	...	@@ -142,12 +142,12 @@
142	142	// read next xtnt block.
143	143	bh = sb_bread(inode->i_sb, i_xblk - 1);
144	144	if ( !bh ) {
145		- QNX4DEBUG(("qnx4: I/O error reading xtnt block [%ld])\n", i_xblk - 1));
	145	+ QNX4DEBUG((KERN_ERR "qnx4: I/O error reading xtnt block [%ld])\n", i_xblk - 1));
146	146	return -EIO;
147	147	}
148	148	xblk = (struct qnx4_xblk*)bh->b_data;
149	149	if ( memcmp( xblk->xblk_signature, "IamXblk", 7 ) ) {
150		- QNX4DEBUG(("qnx4: block at %ld is not a valid xtnt\n", qnx4_inode->i_xblk));
	150	+ QNX4DEBUG((KERN_ERR "qnx4: block at %ld is not a valid xtnt\n", qnx4_inode->i_xblk));
151	151	return -EIO;
152	152	}
153	153	}
...	...	@@ -168,7 +168,7 @@
168	168	brelse( bh );
169	169	}
170	170
171		- QNX4DEBUG(("qnx4: mapping block %ld of inode %ld = %ld\n",iblock,inode->i_ino,block));
	171	+ QNX4DEBUG((KERN_INFO "qnx4: mapping block %ld of inode %ld = %ld\n",iblock,inode->i_ino,block));
172	172	return block;
173	173	}
174	174
...	...	@@ -209,7 +209,7 @@
209	209	if (*(qnx4_sb(sb)->sb->RootDir.di_fname) != '/') {
210	210	return "no qnx4 filesystem (no root dir).";
211	211	} else {
212		- QNX4DEBUG(("QNX4 filesystem found on dev %s.\n", sb->s_id));
	212	+ QNX4DEBUG((KERN_NOTICE "QNX4 filesystem found on dev %s.\n", sb->s_id));
213	213	rd = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_blk) - 1;
214	214	rl = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_size);
215	215	for (j = 0; j < rl; j++) {
...	...	@@ -220,7 +220,7 @@
220	220	for (i = 0; i < QNX4_INODES_PER_BLOCK; i++) {
221	221	rootdir = (struct qnx4_inode_entry ) (bh->b_data + i QNX4_DIR_ENTRY_SIZE);
222	222	if (rootdir->di_fname != NULL) {
223		- QNX4DEBUG(("Rootdir entry found : [%s]\n", rootdir->di_fname));
	223	+ QNX4DEBUG((KERN_INFO "rootdir entry found : [%s]\n", rootdir->di_fname));
224	224	if (!strncmp(rootdir->di_fname, QNX4_BMNAME, sizeof QNX4_BMNAME)) {
225	225	found = 1;
226	226	qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL );
227	227
...	...	@@ -265,12 +265,12 @@
265	265	if we don't belong here... */
266	266	bh = sb_bread(s, 1);
267	267	if (!bh) {
268		- printk("qnx4: unable to read the superblock\n");
	268	+ printk(KERN_ERR "qnx4: unable to read the superblock\n");
269	269	goto outnobh;
270	270	}
271	271	if ( le32_to_cpup((__le32*) bh->b_data) != QNX4_SUPER_MAGIC ) {
272	272	if (!silent)
273		- printk("qnx4: wrong fsid in superblock.\n");
	273	+ printk(KERN_ERR "qnx4: wrong fsid in superblock.\n");
274	274	goto out;
275	275	}
276	276	s->s_op = &qnx4_sops;
277	277
...	...	@@ -284,14 +284,14 @@
284	284	errmsg = qnx4_checkroot(s);
285	285	if (errmsg != NULL) {
286	286	if (!silent)
287		- printk("qnx4: %s\n", errmsg);
	287	+ printk(KERN_ERR "qnx4: %s\n", errmsg);
288	288	goto out;
289	289	}
290	290
291	291	/* does root not have inode number QNX4_ROOT_INO ?? */
292	292	root = qnx4_iget(s, QNX4_ROOT_INO * QNX4_INODES_PER_BLOCK);
293	293	if (IS_ERR(root)) {
294		- printk("qnx4: get inode failed\n");
	294	+ printk(KERN_ERR "qnx4: get inode failed\n");
295	295	ret = PTR_ERR(root);
296	296	goto out;
297	297	}
...	...	@@ -374,7 +374,7 @@
374	374	qnx4_inode = qnx4_raw_inode(inode);
375	375	inode->i_mode = 0;
376	376
377		- QNX4DEBUG(("Reading inode : [%d]\n", ino));
	377	+ QNX4DEBUG((KERN_INFO "reading inode : [%d]\n", ino));
378	378	if (!ino) {
379	379	printk(KERN_ERR "qnx4: bad inode number on dev %s: %lu is "
380	380	"out of range\n",
...	...	@@ -385,7 +385,7 @@
385	385	block = ino / QNX4_INODES_PER_BLOCK;
386	386
387	387	if (!(bh = sb_bread(sb, block))) {
388		- printk("qnx4: major problem: unable to read inode from dev "
	388	+ printk(KERN_ERR "qnx4: major problem: unable to read inode from dev "
389	389	"%s\n", sb->s_id);
390	390	iget_failed(inode);
391	391	return ERR_PTR(-EIO);
...	...	@@ -499,7 +499,7 @@
499	499	return err;
500	500	}
501	501
502		- printk("QNX4 filesystem 0.2.3 registered.\n");
	502	+ printk(KERN_INFO "QNX4 filesystem 0.2.3 registered.\n");
503	503	return 0;
504	504	}
505	505
...	...	@@ -30,7 +30,7 @@
30	30	int namelen, thislen;
31	31
32	32	if (bh == NULL) {
33		- printk("qnx4: matching unassigned buffer !\n");
	33	+ printk(KERN_WARNING "qnx4: matching unassigned buffer !\n");
34	34	return 0;
35	35	}
36	36	de = (struct qnx4_inode_entry ) (bh->b_data + offset);
...	...	@@ -66,7 +66,7 @@
66	66
67	67	*res_dir = NULL;
68	68	if (!dir->i_sb) {
69		- printk("qnx4: no superblock on dir.\n");
	69	+ printk(KERN_WARNING "qnx4: no superblock on dir.\n");
70	70	return NULL;
71	71	}
72	72	bh = NULL;
...	...	@@ -124,7 +124,7 @@
124	124	foundinode = qnx4_iget(dir->i_sb, ino);
125	125	if (IS_ERR(foundinode)) {
126	126	unlock_kernel();
127		- QNX4DEBUG(("qnx4: lookup->iget -> error %ld\n",
	127	+ QNX4DEBUG((KERN_ERR "qnx4: lookup->iget -> error %ld\n",
128	128	PTR_ERR(foundinode)));
129	129	return ERR_CAST(foundinode);
130	130	}