rt2x00: Endless loop on hub port power down

[firefly-linux-kernel-4.4.55.git] / fs / gfs2 / rgrp.c

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index a1da2134923592e7ca9feaa1a3c1a6b707946df2..281a7716e3f3703bf6cd97902330118521e85625 100644 (file)
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -7,6 +7,8 @@
  * of the GNU General Public License version 2.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
@@ -99,12 +101,12 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone,
        cur_state = (*byte1 >> bit) & GFS2_BIT_MASK;
 
        if (unlikely(!valid_change[new_state * 4 + cur_state])) {
-               printk(KERN_WARNING "GFS2: buf_blk = 0x%x old_state=%d, "
-                      "new_state=%d\n", rbm->offset, cur_state, new_state);
-               printk(KERN_WARNING "GFS2: rgrp=0x%llx bi_start=0x%x\n",
-                      (unsigned long long)rbm->rgd->rd_addr, bi->bi_start);
-               printk(KERN_WARNING "GFS2: bi_offset=0x%x bi_len=0x%x\n",
-                      bi->bi_offset, bi->bi_len);
+               pr_warn("buf_blk = 0x%x old_state=%d, new_state=%d\n",
+                       rbm->offset, cur_state, new_state);
+               pr_warn("rgrp=0x%llx bi_start=0x%x\n",
+                       (unsigned long long)rbm->rgd->rd_addr, bi->bi_start);
+               pr_warn("bi_offset=0x%x bi_len=0x%x\n",
+                       bi->bi_offset, bi->bi_len);
                dump_stack();
                gfs2_consist_rgrpd(rbm->rgd);
                return;
@@ -736,11 +738,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)
 
 static void gfs2_rindex_print(const struct gfs2_rgrpd *rgd)
 {
-       printk(KERN_INFO "  ri_addr = %llu\n", (unsigned long long)rgd->rd_addr);
-       printk(KERN_INFO "  ri_length = %u\n", rgd->rd_length);
-       printk(KERN_INFO "  ri_data0 = %llu\n", (unsigned long long)rgd->rd_data0);
-       printk(KERN_INFO "  ri_data = %u\n", rgd->rd_data);
-       printk(KERN_INFO "  ri_bitbytes = %u\n", rgd->rd_bitbytes);
+       pr_info("ri_addr = %llu\n", (unsigned long long)rgd->rd_addr);
+       pr_info("ri_length = %u\n", rgd->rd_length);
+       pr_info("ri_data0 = %llu\n", (unsigned long long)rgd->rd_data0);
+       pr_info("ri_data = %u\n", rgd->rd_data);
+       pr_info("ri_bitbytes = %u\n", rgd->rd_bitbytes);
 }
 
 /**
@@ -1102,7 +1104,7 @@ static u32 count_unlinked(struct gfs2_rgrpd *rgd)
  * Returns: errno
  */
 
-int gfs2_rgrp_bh_get(struct gfs2_rgrpd *rgd)
+static int gfs2_rgrp_bh_get(struct gfs2_rgrpd *rgd)
 {
        struct gfs2_sbd *sdp = rgd->rd_sbd;
        struct gfs2_glock *gl = rgd->rd_gl;
@@ -1169,7 +1171,7 @@ fail:
        return error;
 }
 
-int update_rgrp_lvb(struct gfs2_rgrpd *rgd)
+static int update_rgrp_lvb(struct gfs2_rgrpd *rgd)
 {
        u32 rl_flags;
 
@@ -2278,7 +2280,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks,
                }
        }
        if (rbm.rgd->rd_free < *nblocks) {
-               printk(KERN_WARNING "nblocks=%u\n", *nblocks);
+               pr_warn("nblocks=%u\n", *nblocks);
                goto rgrp_error;
        }
 
@@ -2296,7 +2298,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks,
 
        gfs2_statfs_change(sdp, 0, -(s64)*nblocks, dinode ? 1 : 0);
        if (dinode)
-               gfs2_trans_add_unrevoke(sdp, block, 1);
+               gfs2_trans_add_unrevoke(sdp, block, *nblocks);
 
        gfs2_quota_change(ip, *nblocks, ip->i_inode.i_uid, ip->i_inode.i_gid);