Merge tag 'gfs2-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux...

[linux-2.6-block.git] / fs / gfs2 / bmap.c

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index f4b895fc632d6cf15a5807e480027ba7549b4667..79581b9bdebb357a62cfd0d821b4de0d74349b03 100644 (file)
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -595,7 +595,6 @@ enum alloc_state {
  * gfs2_iomap_alloc - Build a metadata tree of the requested height
  * @inode: The GFS2 inode
  * @iomap: The iomap structure
- * @flags: iomap flags
  * @mp: The metapath, with proper height information calculated
  *
  * In this routine we may have to alloc:
@@ -622,7 +621,7 @@ enum alloc_state {
  */
 
 static int gfs2_iomap_alloc(struct inode *inode, struct iomap *iomap,
-                           unsigned flags, struct metapath *mp)
+                           struct metapath *mp)
 {
        struct gfs2_inode *ip = GFS2_I(inode);
        struct gfs2_sbd *sdp = GFS2_SB(inode);
@@ -1088,7 +1087,7 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos,
                }
 
                if (iomap->type == IOMAP_HOLE) {
-                       ret = gfs2_iomap_alloc(inode, iomap, flags, mp);
+                       ret = gfs2_iomap_alloc(inode, iomap, mp);
                        if (ret) {
                                gfs2_trans_end(sdp);
                                gfs2_inplace_release(ip);
@@ -1234,7 +1233,7 @@ int gfs2_block_map(struct inode *inode, sector_t lblock,
        if (create) {
                ret = gfs2_iomap_get(inode, pos, length, IOMAP_WRITE, &iomap, &mp);
                if (!ret && iomap.type == IOMAP_HOLE)
-                       ret = gfs2_iomap_alloc(inode, &iomap, IOMAP_WRITE, &mp);
+                       ret = gfs2_iomap_alloc(inode, &iomap, &mp);
                release_metapath(&mp);
        } else {
                ret = gfs2_iomap_get(inode, pos, length, 0, &iomap, &mp);
@@ -1464,7 +1463,7 @@ int gfs2_iomap_get_alloc(struct inode *inode, loff_t pos, loff_t length,
 
        ret = gfs2_iomap_get(inode, pos, length, IOMAP_WRITE, iomap, &mp);
        if (!ret && iomap->type == IOMAP_HOLE)
-               ret = gfs2_iomap_alloc(inode, iomap, IOMAP_WRITE, &mp);
+               ret = gfs2_iomap_alloc(inode, iomap, &mp);
        release_metapath(&mp);
        return ret;
 }
@@ -1864,9 +1863,8 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length)
                        gfs2_assert_withdraw(sdp, bh);
                        if (gfs2_assert_withdraw(sdp,
                                                 prev_bnr != bh->b_blocknr)) {
-                               printk(KERN_EMERG "GFS2: fsid=%s:inode %llu, "
-                                      "block:%llu, i_h:%u, s_h:%u, mp_h:%u\n",
-                                      sdp->sd_fsname,
+                               fs_emerg(sdp, "inode %llu, block:%llu, i_h:%u,"
+                                        "s_h:%u, mp_h:%u\n",
                                       (unsigned long long)ip->i_no_addr,
                                       prev_bnr, ip->i_height, strip_h, mp_h);
                        }