diff --git a/[refs] b/[refs]
index c335cfed15c9..10bd7d43df3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 086d8334cf73b3bb695b82dd864a7a8b00d96b7e
+refs/heads/master: e06dfc492870e1d380f02722cde084b724dc197b
diff --git a/trunk/fs/gfs2/bmap.c b/trunk/fs/gfs2/bmap.c
index ae7d205de0d1..3c4039d5eef1 100644
--- a/trunk/fs/gfs2/bmap.c
+++ b/trunk/fs/gfs2/bmap.c
@@ -763,7 +763,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh,
 	int metadata;
 	unsigned int revokes = 0;
 	int x;
-	int error;
+	int error = 0;
 
 	if (!*top)
 		sm->sm_first = 0;