diff --git a/[refs] b/[refs]
index 0670162f0d5b..368bdf68f274 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0a24741cac414aba5918e9939afafa70c37f952
+refs/heads/master: 3ebf44902f77537b5784eb5059c2b78d8b5a920a
diff --git a/trunk/fs/gfs2/ops_export.c b/trunk/fs/gfs2/ops_export.c
index e317db2a5548..99ea5659bc2c 100644
--- a/trunk/fs/gfs2/ops_export.c
+++ b/trunk/fs/gfs2/ops_export.c
@@ -28,6 +28,7 @@
 
 #define GFS2_SMALL_FH_SIZE 4
 #define GFS2_LARGE_FH_SIZE 8
+#define GFS2_OLD_FH_SIZE 10
 
 static struct dentry *gfs2_decode_fh(struct super_block *sb,
 				     __u32 *p,
@@ -44,6 +45,7 @@ static struct dentry *gfs2_decode_fh(struct super_block *sb,
 
 	switch (fh_len) {
 	case GFS2_LARGE_FH_SIZE:
+	case GFS2_OLD_FH_SIZE:
 		parent.no_formal_ino = ((u64)be32_to_cpu(fh[4])) << 32;
 		parent.no_formal_ino |= be32_to_cpu(fh[5]);
 		parent.no_addr = ((u64)be32_to_cpu(fh[6])) << 32;