diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
commit | 803db244b9f71102e366fd689000c1417b9a7508 (patch) | |
tree | 2fe1abfd16cded8074905b6b91d9d1943e15325e /fs/jffs2/summary.c | |
parent | 8b98a37c4b00f3fbcf162281bd4595777e61241b (diff) | |
parent | f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a (diff) | |
download | talos-obmc-linux-803db244b9f71102e366fd689000c1417b9a7508.tar.gz talos-obmc-linux-803db244b9f71102e366fd689000c1417b9a7508.zip |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'fs/jffs2/summary.c')
-rw-r--r-- | fs/jffs2/summary.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c index c19bd476e8ec..e52cef526d90 100644 --- a/fs/jffs2/summary.c +++ b/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; |