diff --git a/[refs] b/[refs] index 58dcf81562ab..30aba09ce2b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e87ed0fc93ffbe2aec296e6912b1dcb19034d6c +refs/heads/master: 465f0a760db4362f3353aaa95fea767e56370006 diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c index b8935afab20b..f1d19603d237 100644 --- a/trunk/fs/gfs2/rgrp.c +++ b/trunk/fs/gfs2/rgrp.c @@ -1378,7 +1378,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *ndata, ip->i_inode.i_gid); rgd->rd_free_clone -= extlen; - trace_gfs2_block_alloc(ip, block, *ndata, + trace_gfs2_block_alloc(ip, block, extlen, dinode ? GFS2_BLKST_DINODE : GFS2_BLKST_USED); *bn = block; return 0;