diff --git a/[refs] b/[refs]
index 816056f72d0a..eb3377bb5d04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa3742fa8545df20e54aa0953a1873cca3a9bd92
+refs/heads/master: ff91cc9bb41b62bc4ea7d5ced396fabf97539df9
diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c
index 69a583ec43c7..91645259e135 100644
--- a/trunk/fs/gfs2/log.c
+++ b/trunk/fs/gfs2/log.c
@@ -343,7 +343,7 @@ static u64 log_bmap(struct gfs2_sbd *sdp, unsigned int lbn)
 
 	list_for_each_entry(je, &sdp->sd_jdesc->extent_list, extent_list) {
 		if (lbn >= je->lblock && lbn < je->lblock + je->blocks)
-			return je->dblock + lbn;
+			return je->dblock + lbn - je->lblock;
 	}
 
 	return -1;