Final changes for release 1.0 of efs.

1 files changed, 13 insertions, 13 deletions

diff --git a/fs/efs/super.c b/fs/efs/super.c
index 582e5a07d..2e370493d 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -33,7 +33,6 @@ static struct super_operations efs_superblock_operations = {
 };
 
 __initfunc(int init_efs_fs(void)) {
-	printk("EFS: "EFS_VERSION" - http://aeschi.ch.eu.org/efs/\n");
 	return register_filesystem(&efs_fs_type);
 }
 
@@ -41,6 +40,7 @@ __initfunc(int init_efs_fs(void)) {
 EXPORT_NO_SYMBOLS;
 
 int init_module(void) {
+	printk("EFS: "EFS_VERSION" - http://aeschi.ch.eu.org/efs/\n");
 	return init_efs_fs();
 }
 
@@ -71,12 +71,12 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
 		csum += be32_to_cpu(cs);
 	}
 	if (csum) {
-		printk("EFS: SGI disklabel: checksum bad, label corrupted\n");
+		printk(KERN_INFO "EFS: SGI disklabel: checksum bad, label corrupted\n");
 		return 0;
 	}
 
 #ifdef DEBUG
-	printk("EFS: bf: \"%16s\"\n", vh->vh_bootfile);
+	printk(KERN_DEBUG "EFS: bf: \"%16s\"\n", vh->vh_bootfile);
 
 	for(i = 0; i < NVDIR; i++) {
 		int	j;
@@ -88,7 +88,7 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
 		name[j] = (char) 0;
 
 		if (name[0]) {
-			printk("EFS: vh: %8s block: 0x%08x size: 0x%08x\n",
+			printk(KERN_DEBUG "EFS: vh: %8s block: 0x%08x size: 0x%08x\n",
 				name,
 				(int) be32_to_cpu(vh->vh_vd[i].vd_lbn),
 				(int) be32_to_cpu(vh->vh_vd[i].vd_nbytes));
@@ -103,7 +103,7 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
 		}
 #ifdef DEBUG
 		if (be32_to_cpu(vh->vh_pt[i].pt_nblks)) {
-			printk("EFS: pt %2d: start: %08d size: %08d type: 0x%02x (%s)\n",
+			printk(KERN_DEBUG "EFS: pt %2d: start: %08d size: %08d type: 0x%02x (%s)\n",
 				i,
 				(int) be32_to_cpu(vh->vh_pt[i].pt_firstlbn),
 				(int) be32_to_cpu(vh->vh_pt[i].pt_nblks),
@@ -118,9 +118,9 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
 	}
 
 	if (slice == -1) {
-		printk("EFS: partition table contained no EFS partitions\n");
+		printk(KERN_NOTICE "EFS: partition table contained no EFS partitions\n");
 	} else {
-		printk("EFS: using slice %d (type %s, offset 0x%x)\n",
+		printk(KERN_INFO "EFS: using slice %d (type %s, offset 0x%x)\n",
 			slice,
 			(pt_entry->pt_name) ? pt_entry->pt_name : "unknown",
 			sblock);
@@ -160,7 +160,7 @@ struct super_block *efs_read_super(struct super_block *s, void *d, int silent) {
 	bh = bread(dev, 0, EFS_BLOCKSIZE);
 
 	if (!bh) {
-		printk("EFS: cannot read volume header\n");
+		printk(KERN_ERR "EFS: cannot read volume header\n");
 		goto out_no_fs_ul;
 	}
 
@@ -178,12 +178,12 @@ struct super_block *efs_read_super(struct super_block *s, void *d, int silent) {
 
 	bh = bread(dev, sb->fs_start + EFS_SUPER, EFS_BLOCKSIZE);
 	if (!bh) {
-		printk("EFS: unable to read superblock\n");
+		printk(KERN_ERR "EFS: unable to read superblock\n");
 		goto out_no_fs_ul;
 	}
 		
 	if (efs_validate_super(sb, (struct efs_super *) bh->b_data)) {
-		printk("EFS: invalid superblock at block %u\n", sb->fs_start + EFS_SUPER);
+		printk(KERN_WARNING "EFS: invalid superblock at block %u\n", sb->fs_start + EFS_SUPER);
 		brelse(bh);
 		goto out_no_fs_ul;
 	}
@@ -194,7 +194,7 @@ struct super_block *efs_read_super(struct super_block *s, void *d, int silent) {
 	s->s_blocksize_bits	= EFS_BLOCKSIZE_BITS;
 	if (!(s->s_flags & MS_RDONLY)) {
 #ifdef DEBUG
-		printk("EFS: forcing read-only mode\n");
+		printk(KERN_INFO "EFS: forcing read-only mode\n");
 #endif
 		s->s_flags |= MS_RDONLY;
 	}
@@ -204,12 +204,12 @@ struct super_block *efs_read_super(struct super_block *s, void *d, int silent) {
 	unlock_super(s);
  
 	if (!(s->s_root)) {
-		printk("EFS: get root inode failed\n");
+		printk(KERN_ERR "EFS: get root inode failed\n");
 		goto out_no_fs;
 	}
 
 	if (check_disk_change(s->s_dev)) {
-		printk("EFS: device changed\n");
+		printk(KERN_ERR "EFS: device changed\n");
 		goto out_no_fs;
 	}