[PATCH 2/3] gfs2: Use fs_ more often

[Joe Perches]

Convert a couple of uses of pr_<level> to fs_<level>
Add and use fs_emerg.

Signed-off-by: Joe Perches <j...@perches.com>
---
 fs/gfs2/quota.c | 4 ++--
 fs/gfs2/util.c  | 6 +++---
 fs/gfs2/util.h  | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 73ed925..27f9435 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 02fb38d..84bf853 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 d365733..515cce2 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, ...)                                           \
-- 
1.8.1.2.459.gbcd45b4.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/