From db78464e91096d3bb1d67712096f088cd5b6ba0e Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Fri, 16 Nov 2012 09:04:16 -0500
Subject: [PATCH] --- yaml --- r: 344359 b: refs/heads/master c:
 b7804161a3a3077c568078dfaa4ee4ffc8817f65 h: refs/heads/master i:   344357:
 a52971e7f4a78a04822fde73b07f07556d018e01   344355:
 f678fbfdc6ff2b28ac77de4ccb0c6e2cc404026b   344351:
 097916fd77729004dc06ec0e16379b7d355da92c v: v3

---
 [refs]                     | 2 +-
 trunk/fs/gfs2/trace_gfs2.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e8f2b41536a5..58dc63b5eafb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e2f8849def738092ad6c0fc2b34737381bc9d26
+refs/heads/master: b7804161a3a3077c568078dfaa4ee4ffc8817f65
diff --git a/trunk/fs/gfs2/trace_gfs2.h b/trunk/fs/gfs2/trace_gfs2.h
index bbdc78af60ca..2ee13e841e9f 100644
--- a/trunk/fs/gfs2/trace_gfs2.h
+++ b/trunk/fs/gfs2/trace_gfs2.h
@@ -486,7 +486,7 @@ TRACE_EVENT(gfs2_block_alloc,
 	),
 
 	TP_fast_assign(
-		__entry->dev		= ip->i_gl->gl_sbd->sd_vfs->s_dev;
+		__entry->dev		= rgd->rd_gl->gl_sbd->sd_vfs->s_dev;
 		__entry->start		= block;
 		__entry->inum		= ip->i_no_addr;
 		__entry->len		= len;