diff --git a/[refs] b/[refs] index 33cb00fac2a7..14e5a4a182ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3864caea2ed2b43bfc92e5cfbe001abe3f002a06 +refs/heads/master: fd4de2d41a9de2d949b0850d637aa84616f87ab8 diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c index 483d4fa987f6..1596e9436c42 100644 --- a/trunk/fs/gfs2/log.c +++ b/trunk/fs/gfs2/log.c @@ -214,7 +214,7 @@ static uint64_t log_bmap(struct gfs2_sbd *sdp, unsigned int lbn) error = gfs2_block_map(sdp->sd_jdesc->jd_inode, lbn, &new, &dbn, &bdy); if (!(!error && dbn)) { - printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, dbn, lbn); + printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, (unsigned long long)dbn, lbn); } gfs2_assert_withdraw(sdp, !error && dbn);