From: Steven Whitehouse <swhiteho@redhat.com>
To: linux-kernel@vger.kernel.org, cluster-devel@redhat.com
Cc: Joe Perches <joe@perches.com>, Steven Whitehouse <swhiteho@redhat.com>
Subject: [PATCH 19/29] GFS2: Use fs_<level> more often
Date: Tue, 1 Apr 2014 10:15:31 +0100 [thread overview]
Message-ID: <1396343741-1524-20-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1396343741-1524-1-git-send-email-swhiteho@redhat.com>
From: Joe Perches <joe@perches.com>
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>
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.3.1
next prev parent reply other threads:[~2014-04-01 9:16 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-01 9:15 GFS2: Pre-pull patch posting (merge window) Steven Whitehouse
2014-04-01 9:15 ` [PATCH 01/29] GFS2: Plug on AIL flush Steven Whitehouse
2014-04-01 9:15 ` [PATCH 02/29] GFS2: Allocate block for xattr at inode alloc time, if required Steven Whitehouse
2014-04-01 9:15 ` [PATCH 03/29] GFS2: journal data writepages update Steven Whitehouse
2014-04-01 9:15 ` [PATCH 04/29] GFS2: Lock i_mutex and use a local gfs2_holder for fallocate Steven Whitehouse
2014-04-01 9:15 ` [PATCH 05/29] GFS2: Add meta readahead field in directory entries Steven Whitehouse
2014-04-01 9:15 ` [PATCH 06/29] GFS2: Mark functions as static in gfs2/rgrp.c Steven Whitehouse
2014-04-01 9:15 ` [PATCH 07/29] GFS2: add missing newline Steven Whitehouse
2014-04-01 9:15 ` [PATCH 08/29] GFS2: Reduce struct gfs2_trans in size Steven Whitehouse
2014-04-01 9:15 ` [PATCH 09/29] GFS2: Move log buffer lists into transaction Steven Whitehouse
2014-04-01 9:15 ` [PATCH 10/29] GFS2: Move log buffer accounting to transaction Steven Whitehouse
2014-04-01 9:15 ` [PATCH 11/29] fs: NULL dereference in posix_acl_to_xattr() Steven Whitehouse
2014-04-01 9:15 ` [PATCH 12/29] GFS2: Remove extra "if" in gfs2_log_flush() Steven Whitehouse
2014-04-01 9:15 ` [PATCH 13/29] GFS2: replace kmalloc - __vmalloc / memset 0 Steven Whitehouse
2014-04-01 9:15 ` [PATCH 14/29] GFS2: Clean up journal extent mapping Steven Whitehouse
2014-04-01 9:15 ` [PATCH 15/29] GFS2: return -E2BIG if hit the maximum limits of ACLs Steven Whitehouse
2014-04-01 9:15 ` [PATCH 16/29] GFS2: global conversion to pr_foo() Steven Whitehouse
2014-04-01 9:15 ` [PATCH 17/29] GFS2: Move recovery variables to journal structure in memory Steven Whitehouse
2014-04-01 9:15 ` [PATCH 18/29] GFS2: Use pr_<level> more consistently Steven Whitehouse
2014-04-01 9:15 ` Steven Whitehouse [this message]
2014-04-01 9:15 ` [PATCH 20/29] GFS2: Convert gfs2_lm_withdraw to use fs_err Steven Whitehouse
2014-04-01 9:15 ` [PATCH 21/29] GFS2: check NULL return value in gfs2_ok_to_move Steven Whitehouse
2014-04-01 9:15 ` [PATCH 22/29] GFS2: Ensure workqueue is scheduled after noexp request Steven Whitehouse
2014-04-01 9:15 ` [PATCH 23/29] GFS2: Re-add a call to log_flush_wait when flushing the journal Steven Whitehouse
2014-04-01 9:15 ` [PATCH 24/29] GFS2: Increase the max number of ACLs Steven Whitehouse
2014-04-01 9:15 ` [PATCH 25/29] GFS2: Remove extraneous function gfs2_security_init Steven Whitehouse
2014-04-01 9:15 ` [PATCH 26/29] GFS2: inline function gfs2_set_mode Steven Whitehouse
2014-04-01 9:15 ` [PATCH 27/29] GFS2: Fix return value in slot_get() Steven Whitehouse
2014-04-01 9:15 ` [PATCH 28/29] GFS2: Fix uninitialized VFS inode in gfs2_create_inode Steven Whitehouse
2014-04-01 9:15 ` [PATCH 29/29] GFS2: Fix address space from page function Steven Whitehouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1396343741-1524-20-git-send-email-swhiteho@redhat.com \
--to=swhiteho@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®