summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-03-06 12:10:46 -0800
committerSteven Whitehouse <swhiteho@redhat.com>2014-03-07 09:32:31 +0000
commit8382e26b2c8ba3c4be552d887eed1969dc1a95b8 (patch)
tree45f516cb15fb55b28c28756255599d7ab320d390
parentd77d1b58aaf4456946b8502c67f16b52fda60303 (diff)
downloadlinux-8382e26b2c8ba3c4be552d887eed1969dc1a95b8.tar.bz2
GFS2: Use fs_<level> more often
Convert a couple of uses of pr_<level> to fs_<level> Add and use fs_emerg. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/quota.c4
-rw-r--r--fs/gfs2/util.c6
-rw-r--r--fs/gfs2/util.h2
3 files changed, 7 insertions, 5 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 73ed92535c8a..27f9435ddd20 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1083,8 +1083,8 @@ static int print_message(struct gfs2_quota_data *qd, char *type)
{
struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
- pr_info("fsid=%s: quota %s for %s %u\n",
- sdp->sd_fsname, type,
+ fs_info(sdp, "quota %s for %s %u\n",
+ type,
(qd->qd_id.type == USRQUOTA) ? "user" : "group",
from_kqid(&init_user_ns, qd->qd_id));
diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index 02fb38db9d19..84bf853046ae 100644
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -32,7 +32,7 @@ mempool_t *gfs2_page_pool __read_mostly;
void gfs2_assert_i(struct gfs2_sbd *sdp)
{
- pr_emerg("fsid=%s: fatal assertion failed\n", sdp->sd_fsname);
+ fs_emerg(sdp, "fatal assertion failed\n");
}
int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
@@ -106,8 +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("fsid=%s: warning: assertion \"%s\" failed at function = %s, file = %s, line = %u\n",
- sdp->sd_fsname, assertion, function, file, line);
+ fs_warn(sdp, "warning: assertion \"%s\" failed at function = %s, file = %s, line = %u\n",
+ assertion, function, file, line);
if (sdp->sd_args.ar_debug)
BUG();
diff --git a/fs/gfs2/util.h b/fs/gfs2/util.h
index d365733744d7..515cce2d7131 100644
--- a/fs/gfs2/util.h
+++ b/fs/gfs2/util.h
@@ -19,6 +19,8 @@
#include "incore.h"
+#define fs_emerg(fs, fmt, ...) \
+ pr_emerg("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__)
#define fs_warn(fs, fmt, ...) \
pr_warn("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__)
#define fs_err(fs, fmt, ...) \