Skip to contentSkip to conversation

add missing KERN_xxx to /linux/fs

PATCH New Andrey Panin 1 participant 1 message Mar 15, 2001

Subsystems (3)
VFS exec and binfmt File locking (flock() and fcntl()/lockf())
lore
Share & tools
lore

Andrey Panin

author
#0 lore raw

PATCH 1/1 add missing KERN_xxx to /linux/fs

Hi all,

IMHO subject is self explaining :)

Best regards.

Signature · 2 lines
Andrey Panin            | Embedded systems software engineer
[email protected]        | PGP key: http://www.orbita1.ru/~pazke/AndreyPanin.asc
fs/buffer.c +7 -7
diff -ur linux.vanilla/fs/buffer.c linux/fs/buffer.c
@@ -1122,7 +1122,7 @@
 		atomic_dec(&buf->b_count);
 		return;
 	}
-	printk("VFS: brelse: Trying to free free buffer\n");
+	printk(KERN_ERR "VFS: brelse: Trying to free free buffer\n");
 }
 
 /*

@@ -2269,7 +2269,7 @@
 	int isize;
 
 	if ((size & 511) || (size > PAGE_SIZE)) {
-		printk("VFS: grow_buffers: size = %d\n",size);
+		printk(KERN_ERR "VFS: grow_buffers: size = %d\n",size);
 		return 0;
 	}
 

@@ -2444,7 +2444,7 @@
 	static char *buf_types[NR_LIST] = { "CLEAN", "LOCKED", "DIRTY", "PROTECTED", };
 #endif
 
-	printk("Buffer memory:   %6dkB\n",
+	printk(KERN_DEBUG "Buffer memory:   %6dkB\n",
 			atomic_read(&buffermem_pages) << (PAGE_SHIFT-10));
 
 #ifdef CONFIG_SMP /* trylock does nothing on UP and so we could deadlock */

@@ -2470,10 +2470,10 @@
 		{
 			int tmp = nr_buffers_type[nlist];
 			if (found != tmp)
-				printk("%9s: BUG -> found %d, reported %d\n",
+				printk(KERN_DEBUG "%9s: BUG -> found %d, reported %d\n",
 				       buf_types[nlist], found, tmp);
 		}
-		printk("%9s: %d buffers, %lu kbyte, %d used (last=%d), "
+		printk(KERN_DEBUG "%9s: %d buffers, %lu kbyte, %d used (last=%d), "
 		       "%d locked, %d protected, %d dirty\n",
 		       buf_types[nlist], found, size_buffers_type[nlist]>>10,
 		       used, lastused, locked, protected, dirty);

@@ -2521,7 +2521,7 @@
 		hash_table = (struct buffer_head **)
 		    __get_free_pages(GFP_ATOMIC, order);
 	} while (hash_table == NULL && --order > 0);
-	printk("Buffer-cache hash table entries: %d (order: %d, %ld bytes)\n",
+	printk(KERN_INFO "Buffer-cache hash table entries: %d (order: %d, %ld bytes)\n",
 	       nr_hash, order, (PAGE_SIZE << order));
 
 	if (!hash_table)

@@ -2801,7 +2801,7 @@
 				goto stop_kupdate;
 		}
 #ifdef DEBUG
-		printk("kupdate() activated...\n");
+		printk(KERN_DEBUG "kupdate() activated...\n");
 #endif
 		sync_old_buffers();
 	}
fs/dquot.c +3 -3
diff -ur linux.vanilla/fs/dquot.c linux/fs/dquot.c
@@ -186,7 +186,7 @@
 {
 #ifdef __DQUOT_PARANOIA
 	if (list_empty(&dquot->dq_free)) {
-		printk("remove_free_dquot: dquot not on the free list??\n");
+		printk(KERN_ERR "remove_free_dquot: dquot not on the free list??\n");
 		return;		/* J.K. Just don't do anything */
 	}
 #endif

@@ -1006,8 +1006,8 @@
 	if (!dquot)
 		return;
 	if (!dquot->dq_count) {
-		printk("VFS: dqput: trying to free free dquot\n");
-		printk("VFS: device %s, dquot of %s %d\n",
+		printk(KERN_ERR "VFS: dqput: trying to free free dquot\n");
+		printk(KERN_ERR "VFS: device %s, dquot of %s %d\n",
 			kdevname(dquot->dq_dev), quotatypes[dquot->dq_type],
 			dquot->dq_id);
 		return;
fs/exec.c +1 -1
diff -ur linux.vanilla/fs/exec.c linux/fs/exec.c
@@ -260,7 +260,7 @@
 	pte_t * pte;
 
 	if (page_count(page) != 1)
-		printk("mem_map disagrees with %p at %08lx\n", page, address);
+		printk(KERN_WARNING "mem_map disagrees with %p at %08lx\n", page, address);
 	pgd = pgd_offset(tsk->mm, address);
 	pmd = pmd_alloc(pgd, address);
 	if (!pmd) {
fs/file_table.c +3 -2
diff -ur linux.vanilla/fs/file_table.c linux/fs/file_table.c
@@ -66,10 +66,11 @@
 			goto new_one;
 		}
 		/* Big problems... */
-		printk("VFS: filp allocation failed\n");
+		printk(KERN_ERR "VFS: filp allocation failed\n");
 
 	} else if (files_stat.max_files > old_max) {
-		printk("VFS: file-max limit %d reached\n", files_stat.max_files);
+		printk(KERN_ERR "VFS: file-max limit %d reached\n", 
+		       files_stat.max_files);
 		old_max = files_stat.max_files;
 	}
 	file_list_unlock();
fs/inode.c +2 -2
diff -ur linux.vanilla/fs/inode.c linux/fs/inode.c
@@ -304,7 +304,7 @@
 		spin_unlock(&inode_lock);
 	}
 	else
-		printk("write_inode_now: no super block\n");
+		printk(KERN_ERR "write_inode_now: no super block\n");
 }
 
 /**

@@ -972,7 +972,7 @@
 			__get_free_pages(GFP_ATOMIC, order);
 	} while (inode_hashtable == NULL && --order >= 0);
 
-	printk("Inode-cache hash table entries: %d (order: %ld, %ld bytes)\n",
+	printk(KERN_INFO "Inode-cache hash table entries: %d (order: %ld, %ld bytes)\n",
 			nr_hash, order, (PAGE_SIZE << order));
 
 	if (!inode_hashtable)
fs/locks.c +1 -1
diff -ur linux.vanilla/fs/locks.c linux/fs/locks.c
@@ -531,7 +531,7 @@
 		return (1);
 
 	default:
-		printk("locks_conflict(): impossible lock type - %d\n",
+		printk(KERN_ERR "locks_conflict(): impossible lock type - %d\n",
 		       caller_fl->fl_type);
 		break;
 	}
fs/msdos/namei.c +1 -1
diff -ur linux.vanilla/fs/msdos/namei.c linux/fs/msdos/namei.c
@@ -389,7 +389,7 @@
 	return res;
 
 mkdir_error:
-	printk("msdos_mkdir: error=%d, attempting cleanup\n", res);
+	printk(KERN_ERR "msdos_mkdir: error=%d, attempting cleanup\n", res);
 	inode->i_nlink = 0;
 	inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
 	dir->i_nlink--;
fs/open.c +3 -3
diff -ur linux.vanilla/fs/open.c linux/fs/open.c
@@ -520,7 +520,7 @@
 
 	error = -ENOENT;
 	if (!(inode = dentry->d_inode)) {
-		printk("chown_common: NULL inode\n");
+		printk(KERN_ERR "chown_common: NULL inode\n");
 		goto out;
 	}
 	error = -EROFS;

@@ -744,7 +744,7 @@
 #if 1
 	/* Sanity check */
 	if (files->fd[fd] != NULL) {
-		printk("get_unused_fd: slot %d not NULL!\n", fd);
+		printk(KERN_ERR "get_unused_fd: slot %d not NULL!\n", fd);
 		files->fd[fd] = NULL;
 	}
 #endif

@@ -807,7 +807,7 @@
 	int retval;
 
 	if (!file_count(filp)) {
-		printk("VFS: Close: file count is 0\n");
+		printk(KERN_WARNING "VFS: Close: file count is 0\n");
 		return 0;
 	}
 	retval = 0;
fs/stat.c +1 -1
diff -ur linux.vanilla/fs/stat.c linux/fs/stat.c
@@ -39,7 +39,7 @@
 
 	if (warncount > 0) {
 		warncount--;
-		printk("VFS: Warning: %s using old stat() call. Recompile your binary.\n",
+		printk(KERN_WARNING "VFS: Warning: %s using old stat() call. Recompile your binary.\n",
 			current->comm);
 	} else if (warncount < 0) {
 		/* it's laughable, but... */
fs/super.c +7 -7
diff -ur linux.vanilla/fs/super.c linux/fs/super.c
@@ -706,7 +706,7 @@
 			continue;
 		if (!s->s_lock)
 			return s;
-		printk("VFS: empty superblock %p locked!\n", s);
+		printk(KERN_WARNING "VFS: empty superblock %p locked!\n", s);
 	}
 	/* Need a new one... */
 	if (nr_super_blocks >= max_super_blocks)

@@ -784,7 +784,7 @@
 		return;
 	if (test_and_clear_bit(MINOR(dev), unnamed_dev_in_use))
 		return;
-	printk("VFS: put_unnamed_dev: freeing unused device %s\n",
+	printk(KERN_WARNING "VFS: put_unnamed_dev: freeing unused device %s\n",
 			kdevname(dev));
 }
 

@@ -915,7 +915,7 @@
 
 	/* Forget any remaining inodes */
 	if (invalidate_inodes(sb)) {
-		printk("VFS: Busy inodes after unmount. "
+		printk(KERN_WARNING "VFS: Busy inodes after unmount. "
 			"Self-destruct in 5 seconds.  Have a nice day...\n");
 	}
 

@@ -1568,9 +1568,9 @@
 		 * Allow the user to distinguish between failed open
 		 * and bad superblock on root device.
 		 */
-		printk ("VFS: Cannot open root device \"%s\" or %s\n",
+		printk (KERN_ERR "VFS: Cannot open root device \"%s\" or %s\n",
 			root_device_name, kdevname (ROOT_DEV));
-		printk ("Please append a correct \"root=\" boot option\n");
+		printk (KERN_ERR "Please append a correct \"root=\" boot option\n");
 		panic("VFS: Unable to mount root fs on %s",
 			kdevname(ROOT_DEV));
 	}

@@ -1599,7 +1599,7 @@
 	panic("VFS: Unable to mount root fs on %s", kdevname(ROOT_DEV));
 
 mount_it:
-	printk ("VFS: Mounted root (%s filesystem)%s.\n",
+	printk (KERN_INFO "VFS: Mounted root (%s filesystem)%s.\n",
 		fs_type->name,
 		(sb->s_flags & MS_RDONLY) ? " readonly" : "");
 	if (path_start >= 0) {

@@ -1779,7 +1779,7 @@
 	mount_root();
 #if 1
 	shrink_dcache();
-	printk("change_root: old root has d_count=%d\n", 
+	printk(KERN_DEBUG "change_root: old root has d_count=%d\n", 
 	       atomic_read(&old_rootmnt->mnt_root->d_count));
 #endif
 	mount_devfs_fs ();