diff --git a/[refs] b/[refs]
index f8400a2ab9cb..e27b0a69f8f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d636b2798732f2cfba48d94aa19b7ba206268a83
+refs/heads/master: 695165dfba5204791bc4ae8911ed8b6326ce6d91
diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h
index 9a67a5954126..034a855a14bb 100644
--- a/trunk/fs/gfs2/incore.h
+++ b/trunk/fs/gfs2/incore.h
@@ -157,7 +157,7 @@ struct gfs2_holder {
 	unsigned gh_flags;
 
 	int gh_error;
-	unsigned gh_iflags;
+	unsigned long gh_iflags;
 	struct completion gh_wait;
 	unsigned long gh_ip;
 };