aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/rgrp.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/rgrp.c')
-rw-r--r--fs/gfs2/rgrp.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index f58574643d07..8d120386bb79 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -99,11 +99,11 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone,
99 cur_state = (*byte1 >> bit) & GFS2_BIT_MASK; 99 cur_state = (*byte1 >> bit) & GFS2_BIT_MASK;
100 100
101 if (unlikely(!valid_change[new_state * 4 + cur_state])) { 101 if (unlikely(!valid_change[new_state * 4 + cur_state])) {
102 printk(KERN_WARNING "GFS2: buf_blk = 0x%x old_state=%d, " 102 pr_warn("GFS2: buf_blk = 0x%x old_state=%d, "
103 "new_state=%d\n", rbm->offset, cur_state, new_state); 103 "new_state=%d\n", rbm->offset, cur_state, new_state);
104 printk(KERN_WARNING "GFS2: rgrp=0x%llx bi_start=0x%x\n", 104 pr_warn("GFS2: rgrp=0x%llx bi_start=0x%x\n",
105 (unsigned long long)rbm->rgd->rd_addr, bi->bi_start); 105 (unsigned long long)rbm->rgd->rd_addr, bi->bi_start);
106 printk(KERN_WARNING "GFS2: bi_offset=0x%x bi_len=0x%x\n", 106 pr_warn("GFS2: bi_offset=0x%x bi_len=0x%x\n",
107 bi->bi_offset, bi->bi_len); 107 bi->bi_offset, bi->bi_len);
108 dump_stack(); 108 dump_stack();
109 gfs2_consist_rgrpd(rbm->rgd); 109 gfs2_consist_rgrpd(rbm->rgd);
@@ -736,11 +736,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)
736 736
737static void gfs2_rindex_print(const struct gfs2_rgrpd *rgd) 737static void gfs2_rindex_print(const struct gfs2_rgrpd *rgd)
738{ 738{
739 printk(KERN_INFO " ri_addr = %llu\n", (unsigned long long)rgd->rd_addr); 739 pr_info(" ri_addr = %llu\n", (unsigned long long)rgd->rd_addr);
740 printk(KERN_INFO " ri_length = %u\n", rgd->rd_length); 740 pr_info(" ri_length = %u\n", rgd->rd_length);
741 printk(KERN_INFO " ri_data0 = %llu\n", (unsigned long long)rgd->rd_data0); 741 pr_info(" ri_data0 = %llu\n", (unsigned long long)rgd->rd_data0);
742 printk(KERN_INFO " ri_data = %u\n", rgd->rd_data); 742 pr_info(" ri_data = %u\n", rgd->rd_data);
743 printk(KERN_INFO " ri_bitbytes = %u\n", rgd->rd_bitbytes); 743 pr_info(" ri_bitbytes = %u\n", rgd->rd_bitbytes);
744} 744}
745 745
746/** 746/**
@@ -2278,7 +2278,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks,
2278 } 2278 }
2279 } 2279 }
2280 if (rbm.rgd->rd_free < *nblocks) { 2280 if (rbm.rgd->rd_free < *nblocks) {
2281 printk(KERN_WARNING "nblocks=%u\n", *nblocks); 2281 pr_warn("nblocks=%u\n", *nblocks);
2282 goto rgrp_error; 2282 goto rgrp_error;
2283 } 2283 }
2284 2284