Merge branch 'block-summary'

Conflicts:
	yaffs_vfs_multi.c

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --cc yaffs_guts.c
Simple merge

diff --cc yaffs_guts.h
index 77c05d3b4924357cb2a9c31531e6392346aea2b5,fc311435207c08bcdbbbd115695e702d610d6aa8..6ec8a47b1d45d89413e9f999d8daaa2fc51f3bf3
--- 1/yaffs_guts.h
--- 2/yaffs_guts.h
+++ b/yaffs_guts.h
@@@ -278,9 -282,12 +280,10 @@@ struct yaffs_block_info 
                                   Block should be prioritised for GC */
        u32 chunk_error_strikes:3;      /* How many times we've had ecc etc
                                failures on this block and tried to reuse it */
+       u32 has_summary:1;      /* The block has a summary */
  
 -#ifdef CONFIG_YAFFS_YAFFS2
        u32 has_shrink_hdr:1;   /* This block has at least one shrink header */
        u32 seq_number;         /* block sequence number for yaffs2 */
 -#endif
  
  };
  

diff --cc yaffs_vfs_multi.c
index 7e28c40514242dbf3c8dbf624a9a12f2fba78a17,15ff4ffdfb838d5ef00f2f0a946228d1ebb635f9..cf9df092390301af2413a5b005b36f0719342d20
--- 1/yaffs_vfs_multi.c
--- 2/yaffs_vfs_multi.c
+++ b/yaffs_vfs_multi.c
@@@ -2835,8 -2863,20 +2838,9 @@@ static struct super_block *yaffs_intern
        if (options.tags_ecc_overridden)
                param->no_tags_ecc = !options.tags_ecc_on;
  
 -#ifdef CONFIG_YAFFS_EMPTY_LOST_AND_FOUND
        param->empty_lost_n_found = 1;
 -#endif
 -
 -#ifdef CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING
 -      param->refresh_period = 0;
 -#else
        param->refresh_period = 500;
 -#endif
 -
 -#ifdef CONFIG_YAFFS__ALWAYS_CHECK_CHUNK_ERASED
 -      param->always_check_erased = 1;
 -#endif
+       param->disable_summary = options.disable_summary;
  
        if (options.empty_lost_and_found_overridden)
                param->empty_lost_n_found = options.empty_lost_and_found;