summaryrefslogtreecommitdiff
path: root/fs/gfs2/util.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-03-06 12:10:45 -0800
committerSteven Whitehouse <swhiteho@redhat.com>2014-03-07 09:30:51 +0000
commitd77d1b58aaf4456946b8502c67f16b52fda60303 (patch)
tree5d829949b7ce4bfcb31c9517a418931d31e48ac2 /fs/gfs2/util.c
parenta17d758b661d6fa01a0d466d7bdda3c131bb68f9 (diff)
GFS2: Use pr_<level> more consistently
Add pr_fmt, remove embedded "GFS2: " prefixes. This now consistently emits lower case "gfs2: " for each message. Other miscellanea around these changes: o Add missing newlines o Coalesce formats o Realign arguments Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/util.c')
-rw-r--r--fs/gfs2/util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index e9d700194015..02fb38db9d19 100644
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -7,6 +7,8 @@
* of the GNU General Public License version 2.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/buffer_head.h>
@@ -30,7 +32,7 @@ mempool_t *gfs2_page_pool __read_mostly;
void gfs2_assert_i(struct gfs2_sbd *sdp)
{
- pr_emerg("GFS2: fsid=%s: fatal assertion failed\n", sdp->sd_fsname);
+ pr_emerg("fsid=%s: fatal assertion failed\n", sdp->sd_fsname);
}
int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
@@ -65,7 +67,7 @@ int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
}
if (sdp->sd_args.ar_errors == GFS2_ERRORS_PANIC)
- panic("GFS2: fsid=%s: panic requested.\n", sdp->sd_fsname);
+ panic("GFS2: fsid=%s: panic requested\n", sdp->sd_fsname);
return -1;
}
@@ -104,10 +106,8 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,
return -2;
if (sdp->sd_args.ar_errors == GFS2_ERRORS_WITHDRAW)
- pr_warn("GFS2: fsid=%s: warning: assertion \"%s\" failed\n"
- "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
- sdp->sd_fsname, assertion,
- sdp->sd_fsname, function, file, line);
+ pr_warn("fsid=%s: warning: assertion \"%s\" failed at function = %s, file = %s, line = %u\n",
+ sdp->sd_fsname, assertion, function, file, line);
if (sdp->sd_args.ar_debug)
BUG();