diff --git a/[refs] b/[refs]
index f62dde039f6c..476c2d6d7846 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 891ba6d4a5f9e6302bb6542592d73feb4d0d3687
+refs/heads/master: 5a60c532c9224babc172fafccc9e2fec6937af6f
diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c
index ee704676b2f1..7df702473252 100644
--- a/trunk/fs/gfs2/log.c
+++ b/trunk/fs/gfs2/log.c
@@ -513,7 +513,8 @@ struct buffer_head *gfs2_log_get_buf(struct gfs2_sbd *sdp)
 static void gfs2_fake_write_endio(struct buffer_head *bh, int uptodate)
 {
 	struct buffer_head *real_bh = bh->b_private;
-	struct gfs2_sbd *sdp = GFS2_SB(real_bh->b_page->mapping->host);
+	struct gfs2_bufdata *bd = real_bh->b_private;
+	struct gfs2_sbd *sdp = bd->bd_gl->gl_sbd;
 
 	end_buffer_write_sync(bh, uptodate);
 	free_buffer_head(bh);