diff --git a/[refs] b/[refs]
index ad03f2675ae5..ae60b81f89e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96da96065bd66164acc3c8a1ea6db4ee765537e9
+refs/heads/master: 27bea3275515e5bd748ed7a492d0df605f5e824a
diff --git a/trunk/fs/jffs2/summary.c b/trunk/fs/jffs2/summary.c
index c19bd476e8ec..e52cef526d90 100644
--- a/trunk/fs/jffs2/summary.c
+++ b/trunk/fs/jffs2/summary.c
@@ -252,6 +252,11 @@ int jffs2_sum_add_kvec(struct jffs2_sb_info *c, const struct kvec *invecs,
 	union jffs2_node_union *node;
 	struct jffs2_eraseblock *jeb;
 
+	if (c->summary->sum_size == JFFS2_SUMMARY_NOSUM_SIZE) {
+		dbg_summary("Summary is disabled for this jeb! Skipping summary info!\n");
+		return 0;
+	}
+
 	node = invecs[0].iov_base;
 	jeb = &c->blocks[ofs / c->sector_size];
 	ofs -= jeb->offset;