aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/trans.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/trans.c')
-rw-r--r--fs/gfs2/trans.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 3fe8e34a9f5c..bead90d27bad 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -7,6 +7,8 @@
7 * of the GNU General Public License version 2. 7 * of the GNU General Public License version 2.
8 */ 8 */
9 9
10#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
11
10#include <linux/sched.h> 12#include <linux/sched.h>
11#include <linux/slab.h> 13#include <linux/slab.h>
12#include <linux/spinlock.h> 14#include <linux/spinlock.h>
@@ -99,13 +101,13 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)
99 101
100static void gfs2_print_trans(const struct gfs2_trans *tr) 102static void gfs2_print_trans(const struct gfs2_trans *tr)
101{ 103{
102 pr_warn("GFS2: Transaction created at: %pSR\n", (void *)tr->tr_ip); 104 pr_warn("Transaction created at: %pSR\n", (void *)tr->tr_ip);
103 pr_warn("GFS2: blocks=%u revokes=%u reserved=%u touched=%u\n", 105 pr_warn("blocks=%u revokes=%u reserved=%u touched=%u\n",
104 tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); 106 tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched);
105 pr_warn("GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n", 107 pr_warn("Buf %u/%u Databuf %u/%u Revoke %u/%u\n",
106 tr->tr_num_buf_new, tr->tr_num_buf_rm, 108 tr->tr_num_buf_new, tr->tr_num_buf_rm,
107 tr->tr_num_databuf_new, tr->tr_num_databuf_rm, 109 tr->tr_num_databuf_new, tr->tr_num_databuf_rm,
108 tr->tr_num_revoke, tr->tr_num_revoke_rm); 110 tr->tr_num_revoke, tr->tr_num_revoke_rm);
109} 111}
110 112
111void gfs2_trans_end(struct gfs2_sbd *sdp) 113void gfs2_trans_end(struct gfs2_sbd *sdp)
@@ -231,8 +233,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
231 set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags); 233 set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
232 mh = (struct gfs2_meta_header *)bd->bd_bh->b_data; 234 mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;
233 if (unlikely(mh->mh_magic != cpu_to_be32(GFS2_MAGIC))) { 235 if (unlikely(mh->mh_magic != cpu_to_be32(GFS2_MAGIC))) {
234 pr_err("Attempting to add uninitialised block to journal " 236 pr_err("Attempting to add uninitialised block to journal (inplace block=%lld)\n",
235 "(inplace block=%lld)\n",
236 (unsigned long long)bd->bd_bh->b_blocknr); 237 (unsigned long long)bd->bd_bh->b_blocknr);
237 BUG(); 238 BUG();
238 } 239 }