aboutsummaryrefslogtreecommitdiff
path: root/fs/gfs2/super.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-02-27 10:57:14 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2006-02-27 10:57:14 -0500
commitd92a8d48085df863032110d9ccb221cde98d14e1 (patch)
treefaf03d9c10e104f3ab3fb8264e70b4662bae5d33 /fs/gfs2/super.c
parent2fcb4a1278ec41508d76786f4c5d23bff3b378ee (diff)
[GFS2] Audit printk and kmalloc
All printk calls now have KERN_ set where required and a couple of kmalloc(), memset(.., 0, ...) calls changed to kzalloc(). This is in response to comments from: Pekka Enberg <penberg@cs.helsinki.fi> and Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r--fs/gfs2/super.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index be80771c414..60e26661872 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -94,7 +94,7 @@ int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb *sb, int silent)
if (sb->sb_header.mh_magic != GFS2_MAGIC ||
sb->sb_header.mh_type != GFS2_METATYPE_SB) {
if (!silent)
- printk("GFS2: not a GFS2 filesystem\n");
+ printk(KERN_WARNING "GFS2: not a GFS2 filesystem\n");
return -EINVAL;
}
@@ -110,11 +110,11 @@ int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb *sb, int silent)
break;
if (!gfs2_old_fs_formats[x]) {
- printk("GFS2: code version (%u, %u) is incompatible "
+ printk(KERN_WARNING "GFS2: code version (%u, %u) is incompatible "
"with ondisk format (%u, %u)\n",
GFS2_FORMAT_FS, GFS2_FORMAT_MULTI,
sb->sb_fs_format, sb->sb_multihost_format);
- printk("GFS2: I don't know how to upgrade this FS\n");
+ printk(KERN_WARNING "GFS2: I don't know how to upgrade this FS\n");
return -EINVAL;
}
}
@@ -125,23 +125,23 @@ int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb *sb, int silent)
break;
if (!gfs2_old_multihost_formats[x]) {
- printk("GFS2: code version (%u, %u) is incompatible "
+ printk(KERN_WARNING "GFS2: code version (%u, %u) is incompatible "
"with ondisk format (%u, %u)\n",
GFS2_FORMAT_FS, GFS2_FORMAT_MULTI,
sb->sb_fs_format, sb->sb_multihost_format);
- printk("GFS2: I don't know how to upgrade this FS\n");
+ printk(KERN_WARNING "GFS2: I don't know how to upgrade this FS\n");
return -EINVAL;
}
}
if (!sdp->sd_args.ar_upgrade) {
- printk("GFS2: code version (%u, %u) is incompatible "
+ printk(KERN_WARNING "GFS2: code version (%u, %u) is incompatible "
"with ondisk format (%u, %u)\n",
GFS2_FORMAT_FS, GFS2_FORMAT_MULTI,
sb->sb_fs_format, sb->sb_multihost_format);
- printk("GFS2: Use the \"upgrade\" mount option to upgrade "
+ printk(KERN_INFO "GFS2: Use the \"upgrade\" mount option to upgrade "
"the FS\n");
- printk("GFS2: See the manual for more details\n");
+ printk(KERN_INFO "GFS2: See the manual for more details\n");
return -EINVAL;
}