target/linux/generic/patches-3.6/512-jffs2_eofdetect.patch

   1 --- a/fs/jffs2/build.c
   2 +++ b/fs/jffs2/build.c
   3 @@ -112,6 +112,17 @@ static int jffs2_build_filesystem(struct
   4         dbg_fsbuild("scanned flash completely\n");
   5         jffs2_dbg_dump_block_lists_nolock(c);
   6
   7 +       if (c->flags & (1 << 7)) {
   8 +               printk("%s(): unlocking the mtd device... ", __func__);
   9 +               if (c->mtd->unlock)
  10 +                       c->mtd->unlock(c->mtd, 0, c->mtd->size);
  11 +               printk("done.\n");
  12 +
  13 +               printk("%s(): erasing all blocks after the end marker... ", __func__);
  14 +               jffs2_erase_pending_blocks(c, -1);
  15 +               printk("done.\n");
  16 +       }
  17 +
  18         dbg_fsbuild("pass 1 starting\n");
  19         c->flags |= JFFS2_SB_FLAG_BUILDING;
  20         /* Now scan the directory tree, increasing nlink according to every dirent found. */
  21 --- a/fs/jffs2/scan.c
  22 +++ b/fs/jffs2/scan.c
  23 @@ -147,8 +147,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
  24                 /* reset summary info for next eraseblock scan */
  25                 jffs2_sum_reset_collected(s);
  26
  27 -               ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
  28 -                                               buf_size, s);
  29 +               if (c->flags & (1 << 7))
  30 +                       ret = BLK_STATE_ALLFF;
  31 +               else
  32 +                       ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
  33 +                                                       buf_size, s);
  34
  35                 if (ret < 0)
  36                         goto out;
  37 @@ -549,6 +552,17 @@ static int jffs2_scan_eraseblock (struct
  38                         return err;
  39         }
  40
  41 +       if ((buf[0] == 0xde) &&
  42 +               (buf[1] == 0xad) &&
  43 +               (buf[2] == 0xc0) &&
  44 +               (buf[3] == 0xde)) {
  45 +               /* end of filesystem. erase everything after this point */
  46 +               printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
  47 +               c->flags |= (1 << 7);
  48 +
  49 +               return BLK_STATE_ALLFF;
  50 +       }
  51 +
  52         /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
  53         ofs = 0;
  54         max_ofs = EMPTY_SCAN_SIZE(c->sector_size);