yaffs Found the bug.

[yaffs2.git] / yaffs_yaffs1.c

diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c
index 89d570e14e6edf08ba9737ad9ea5db0c01042d1c..b6c43e5ef3571c88c4e8a25b1698fa4efa372bee 100644 (file)
--- a/yaffs_yaffs1.c
+++ b/yaffs_yaffs1.c
@@ -17,7 +17,7 @@
 #include "yaffs_bitmap.h"
 #include "yaffs_getblockinfo.h"
 #include "yaffs_nand.h"
 #include "yaffs_bitmap.h"
 #include "yaffs_getblockinfo.h"
 #include "yaffs_nand.h"

-
+#include "yaffs_attribs.h"

 
 int yaffs1_scan(struct yaffs_dev *dev)
 {
 
 int yaffs1_scan(struct yaffs_dev *dev)
 {


@@ -40,11 +40,8 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
        struct yaffs_shadow_fixer *shadow_fixers = NULL;
 
 
        struct yaffs_shadow_fixer *shadow_fixers = NULL;
 

-

        u8 *chunk_data;
 
        u8 *chunk_data;
 

-
-

        T(YAFFS_TRACE_SCAN,
          (TSTR("yaffs1_scan starts  intstartblk %d intendblk %d..." TENDSTR),
           dev->internal_start_block, dev->internal_end_block));
        T(YAFFS_TRACE_SCAN,
          (TSTR("yaffs1_scan starts  intstartblk %d intendblk %d..." TENDSTR),
           dev->internal_start_block, dev->internal_end_block));


@@ -55,7 +52,8 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
        /* Scan all the blocks to determine their state */
        bi = dev->block_info;
 
        /* Scan all the blocks to determine their state */
        bi = dev->block_info;

-       for (blk = dev->internal_start_block; blk <= dev->internal_end_block; blk++) {
+       for (blk = dev->internal_start_block; blk <= dev->internal_end_block;
+            blk++) {

                yaffs_clear_chunk_bits(dev, blk);
                bi->pages_in_use = 0;
                bi->soft_del_pages = 0;
                yaffs_clear_chunk_bits(dev, blk);
                bi->pages_in_use = 0;
                bi->soft_del_pages = 0;


@@ -85,9 +83,8 @@ int yaffs1_scan(struct yaffs_dev *dev)
        }
 
        /* For each block.... */
        }
 
        /* For each block.... */

-       for (blk= dev->internal_start_block; 
-               !alloc_failed && blk <= dev->internal_end_block;
-               blk++) {
+       for (blk = dev->internal_start_block;
+            !alloc_failed && blk <= dev->internal_end_block; blk++) {

 
                YYIELD();
 
 
                YYIELD();
 


@@ -96,18 +93,19 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
                deleted = 0;
 
 
                deleted = 0;
 

-               /* For each chunk in each block that needs scanning....*/
+               /* For each chunk in each block that needs scanning.... */

                for (c = 0; !alloc_failed && c < dev->param.chunks_per_block &&
                     state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) {
                        /* Read the tags and decide what to do */
                        chunk = blk * dev->param.chunks_per_block + c;
 
                        result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL,
                for (c = 0; !alloc_failed && c < dev->param.chunks_per_block &&
                     state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) {
                        /* Read the tags and decide what to do */
                        chunk = blk * dev->param.chunks_per_block + c;
 
                        result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL,

-                                                       &tags);
+                                                         &tags);

 
                        /* Let's have a good look at this chunk... */
 
 
                        /* Let's have a good look at this chunk... */
 

-                       if (tags.ecc_result == YAFFS_ECC_RESULT_UNFIXED || tags.is_deleted) {
+                       if (tags.ecc_result == YAFFS_ECC_RESULT_UNFIXED
+                           || tags.is_deleted) {

                                /* YAFFS1 only...
                                 * A deleted chunk
                                 */
                                /* YAFFS1 only...
                                 * A deleted chunk
                                 */


@@ -138,7 +136,8 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
                                }
 
 
                                }
 

-                               dev->n_free_chunks += (dev->param.chunks_per_block - c);
+                               dev->n_free_chunks +=
+                                   (dev->param.chunks_per_block - c);

                        } else if (tags.chunk_id > 0) {
                                /* chunk_id > 0 so it is a data chunk... */
                                unsigned int endpos;
                        } else if (tags.chunk_id > 0) {
                                /* chunk_id > 0 so it is a data chunk... */
                                unsigned int endpos;


@@ -147,9 +146,8 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                bi->pages_in_use++;
 
                                in = yaffs_find_or_create_by_number(dev,
                                bi->pages_in_use++;
 
                                in = yaffs_find_or_create_by_number(dev,

-                                                                     tags.
-                                                                     obj_id,
-                                                                     YAFFS_OBJECT_TYPE_FILE);
+                                                                   tags.obj_id,
+                                                                   YAFFS_OBJECT_TYPE_FILE);

                                /* PutChunkIntoFile checks for a clash (two data chunks with
                                 * the same chunk_id).
                                 */
                                /* PutChunkIntoFile checks for a clash (two data chunks with
                                 * the same chunk_id).
                                 */


@@ -158,24 +156,27 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                        alloc_failed = 1;
 
                                if (in) {
                                        alloc_failed = 1;
 
                                if (in) {

-                                       if (!yaffs_put_chunk_in_file(in, tags.chunk_id, chunk, 1))
+                                       if (!yaffs_put_chunk_in_file
+                                           (in, tags.chunk_id, chunk, 1))

                                                alloc_failed = 1;
                                }
 
                                endpos =
                                                alloc_failed = 1;
                                }
 
                                endpos =

-                                   (tags.chunk_id - 1) * dev->data_bytes_per_chunk +
+                                   (tags.chunk_id -
+                                    1) * dev->data_bytes_per_chunk +

                                    tags.n_bytes;
                                    tags.n_bytes;

-                               if (in &&
-                                   in->variant_type == YAFFS_OBJECT_TYPE_FILE
+                               if (in
+                                   && in->variant_type ==
+                                   YAFFS_OBJECT_TYPE_FILE

                                    && in->variant.file_variant.scanned_size <
                                    endpos) {
                                    && in->variant.file_variant.scanned_size <
                                    endpos) {

-                                       in->variant.file_variant.
-                                           scanned_size = endpos;
+                                       in->variant.file_variant.scanned_size =
+                                           endpos;

                                        if (!dev->param.use_header_file_size) {
                                        if (!dev->param.use_header_file_size) {

-                                               in->variant.file_variant.
-                                                   file_size =
-                                                   in->variant.file_variant.
-                                                   scanned_size;
+                                               in->variant.
+                                                   file_variant.file_size =
+                                                   in->variant.
+                                                   file_variant.scanned_size;

                                        }
 
                                }
                                        }
 
                                }


@@ -188,13 +189,12 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                bi->pages_in_use++;
 
                                result = yaffs_rd_chunk_tags_nand(dev, chunk,
                                bi->pages_in_use++;
 
                                result = yaffs_rd_chunk_tags_nand(dev, chunk,

-                                                               chunk_data,
-                                                               NULL);
+                                                                 chunk_data,
+                                                                 NULL);

 
 

-                               oh = (struct yaffs_obj_hdr *) chunk_data;
+                               oh = (struct yaffs_obj_hdr *)chunk_data;

 
 

-                               in = yaffs_find_by_number(dev,
-                                                             tags.obj_id);
+                               in = yaffs_find_by_number(dev, tags.obj_id);

                                if (in && in->variant_type != oh->type) {
                                        /* This should not happen, but somehow
                                         * Wev'e ended up with an obj_id that has been reused but not yet
                                if (in && in->variant_type != oh->type) {
                                        /* This should not happen, but somehow
                                         * Wev'e ended up with an obj_id that has been reused but not yet


@@ -207,9 +207,8 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                }
 
                                in = yaffs_find_or_create_by_number(dev,
                                }
 
                                in = yaffs_find_or_create_by_number(dev,

-                                                                     tags.
-                                                                     obj_id,
-                                                                     oh->type);
+                                                                   tags.obj_id,
+                                                                   oh->type);

 
                                if (!in)
                                        alloc_failed = 1;
 
                                if (!in)
                                        alloc_failed = 1;


@@ -217,16 +216,21 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                if (in && oh->shadows_obj > 0) {
 
                                        struct yaffs_shadow_fixer *fixer;
                                if (in && oh->shadows_obj > 0) {
 
                                        struct yaffs_shadow_fixer *fixer;

-                                       fixer = YMALLOC(sizeof(struct yaffs_shadow_fixer));
+                                       fixer =
+                                           YMALLOC(sizeof
+                                                   (struct
+                                                    yaffs_shadow_fixer));

                                        if (fixer) {
                                                fixer->next = shadow_fixers;
                                                shadow_fixers = fixer;
                                                fixer->obj_id = tags.obj_id;
                                        if (fixer) {
                                                fixer->next = shadow_fixers;
                                                shadow_fixers = fixer;
                                                fixer->obj_id = tags.obj_id;

-                                               fixer->shadowed_id = oh->shadows_obj;
+                                               fixer->shadowed_id =
+                                                   oh->shadows_obj;

                                                T(YAFFS_TRACE_SCAN,
                                                  (TSTR
                                                T(YAFFS_TRACE_SCAN,
                                                  (TSTR

-                                                  (" Shadow fixer: %d shadows %d" TENDSTR),
-                                                  fixer->obj_id, fixer->shadowed_id));
+                                                  (" Shadow fixer: %d shadows %d"
+                                                   TENDSTR), fixer->obj_id,
+                                                  fixer->shadowed_id));

 
                                        }
 
 
                                        }
 


@@ -236,44 +240,33 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                        /* We have already filled this one. We have a duplicate and need to resolve it. */
 
                                        unsigned existing_serial = in->serial;
                                        /* We have already filled this one. We have a duplicate and need to resolve it. */
 
                                        unsigned existing_serial = in->serial;

-                                       unsigned new_serial = tags.serial_number;
+                                       unsigned new_serial =
+                                           tags.serial_number;

 
 

-                                       if (((existing_serial + 1) & 3) == new_serial) {
+                                       if (((existing_serial + 1) & 3) ==
+                                           new_serial) {

                                                /* Use new one - destroy the exisiting one */
                                                yaffs_chunk_del(dev,
                                                /* Use new one - destroy the exisiting one */
                                                yaffs_chunk_del(dev,

-                                                                 in->hdr_chunk,
-                                                                 1, __LINE__);
+                                                               in->hdr_chunk,
+                                                               1, __LINE__);

                                                in->valid = 0;
                                        } else {
                                                /* Use existing - destroy this one. */
                                                yaffs_chunk_del(dev, chunk, 1,
                                                in->valid = 0;
                                        } else {
                                                /* Use existing - destroy this one. */
                                                yaffs_chunk_del(dev, chunk, 1,

-                                                                 __LINE__);
+                                                               __LINE__);

                                        }
                                }
 
                                if (in && !in->valid &&
                                    (tags.obj_id == YAFFS_OBJECTID_ROOT ||
                                        }
                                }
 
                                if (in && !in->valid &&
                                    (tags.obj_id == YAFFS_OBJECTID_ROOT ||

-                                    tags.obj_id == YAFFS_OBJECTID_LOSTNFOUND)) {
+                                    tags.obj_id ==
+                                    YAFFS_OBJECTID_LOSTNFOUND)) {

                                        /* We only load some info, don't fiddle with directory structure */
                                        in->valid = 1;
                                        in->variant_type = oh->type;
 
                                        in->yst_mode = oh->yst_mode;
                                        /* We only load some info, don't fiddle with directory structure */
                                        in->valid = 1;
                                        in->variant_type = oh->type;
 
                                        in->yst_mode = oh->yst_mode;

-#ifdef CONFIG_YAFFS_WINCE
-                                       in->win_atime[0] = oh->win_atime[0];
-                                       in->win_ctime[0] = oh->win_ctime[0];
-                                       in->win_mtime[0] = oh->win_mtime[0];
-                                       in->win_atime[1] = oh->win_atime[1];
-                                       in->win_ctime[1] = oh->win_ctime[1];
-                                       in->win_mtime[1] = oh->win_mtime[1];
-#else
-                                       in->yst_uid = oh->yst_uid;
-                                       in->yst_gid = oh->yst_gid;
-                                       in->yst_atime = oh->yst_atime;
-                                       in->yst_mtime = oh->yst_mtime;
-                                       in->yst_ctime = oh->yst_ctime;
-                                       in->yst_rdev = oh->yst_rdev;
-#endif
+                                       yaffs_load_attribs(in, oh);

                                        in->hdr_chunk = chunk;
                                        in->serial = tags.serial_number;
 
                                        in->hdr_chunk = chunk;
                                        in->serial = tags.serial_number;
 


@@ -284,21 +277,7 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                        in->variant_type = oh->type;
 
                                        in->yst_mode = oh->yst_mode;
                                        in->variant_type = oh->type;
 
                                        in->yst_mode = oh->yst_mode;

-#ifdef CONFIG_YAFFS_WINCE
-                                       in->win_atime[0] = oh->win_atime[0];
-                                       in->win_ctime[0] = oh->win_ctime[0];
-                                       in->win_mtime[0] = oh->win_mtime[0];
-                                       in->win_atime[1] = oh->win_atime[1];
-                                       in->win_ctime[1] = oh->win_ctime[1];
-                                       in->win_mtime[1] = oh->win_mtime[1];
-#else
-                                       in->yst_uid = oh->yst_uid;
-                                       in->yst_gid = oh->yst_gid;
-                                       in->yst_atime = oh->yst_atime;
-                                       in->yst_mtime = oh->yst_mtime;
-                                       in->yst_ctime = oh->yst_ctime;
-                                       in->yst_rdev = oh->yst_rdev;
-#endif
+                                       yaffs_load_attribs(in, oh);

                                        in->hdr_chunk = chunk;
                                        in->serial = tags.serial_number;
 
                                        in->hdr_chunk = chunk;
                                        in->serial = tags.serial_number;
 


@@ -319,11 +298,11 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                            YAFFS_OBJECT_TYPE_UNKNOWN) {
                                                /* Set up as a directory */
                                                parent->variant_type =
                                            YAFFS_OBJECT_TYPE_UNKNOWN) {
                                                /* Set up as a directory */
                                                parent->variant_type =

-                                                       YAFFS_OBJECT_TYPE_DIRECTORY;
-                                               YINIT_LIST_HEAD(&parent->variant.
-                                                               dir_variant.
-                                                               children);
-                                       } else if (!parent || parent->variant_type !=
+                                                   YAFFS_OBJECT_TYPE_DIRECTORY;
+                                               INIT_LIST_HEAD(&parent->
+                                                              variant.dir_variant.children);
+                                       } else if (!parent
+                                                  || parent->variant_type !=

                                                   YAFFS_OBJECT_TYPE_DIRECTORY) {
                                                /* Hoosterman, another problem....
                                                 * We're trying to use a non-directory as a directory
                                                   YAFFS_OBJECT_TYPE_DIRECTORY) {
                                                /* Hoosterman, another problem....
                                                 * We're trying to use a non-directory as a directory


@@ -339,7 +318,8 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                        yaffs_add_obj_to_dir(parent, in);
 
                                        if (0 && (parent == dev->del_dir ||
                                        yaffs_add_obj_to_dir(parent, in);
 
                                        if (0 && (parent == dev->del_dir ||

-                                                 parent == dev->unlinked_dir)) {
+                                                 parent ==
+                                                 dev->unlinked_dir)) {

                                                in->deleted = 1;        /* If it is unlinked at start up then it wants deleting */
                                                dev->n_deleted_files++;
                                        }
                                                in->deleted = 1;        /* If it is unlinked at start up then it wants deleting */
                                                dev->n_deleted_files++;
                                        }


@@ -355,20 +335,21 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                                /* Todo got a problem */
                                                break;
                                        case YAFFS_OBJECT_TYPE_FILE:
                                                /* Todo got a problem */
                                                break;
                                        case YAFFS_OBJECT_TYPE_FILE:

-                                               if (dev->param.use_header_file_size)
+                                               if (dev->param.
+                                                   use_header_file_size)

 
 

-                                                       in->variant.file_variant.
-                                                           file_size =
-                                                           oh->file_size;
+                                                       in->variant.
+                                                           file_variant.file_size
+                                                           = oh->file_size;

 
                                                break;
                                        case YAFFS_OBJECT_TYPE_HARDLINK:
 
                                                break;
                                        case YAFFS_OBJECT_TYPE_HARDLINK:

-                                               in->variant.hardlink_variant.
-                                                       equiv_id =
-                                                       oh->equiv_id;
+                                               in->variant.
+                                                   hardlink_variant.equiv_id =
+                                                   oh->equiv_id;

                                                in->hard_links.next =
                                                in->hard_links.next =

-                                                       (struct ylist_head *)
-                                                       hard_list;
+                                                   (struct list_head *)
+                                                   hard_list;

                                                hard_list = in;
                                                break;
                                        case YAFFS_OBJECT_TYPE_DIRECTORY:
                                                hard_list = in;
                                                break;
                                        case YAFFS_OBJECT_TYPE_DIRECTORY:


@@ -378,9 +359,11 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                                /* Do nothing */
                                                break;
                                        case YAFFS_OBJECT_TYPE_SYMLINK:
                                                /* Do nothing */
                                                break;
                                        case YAFFS_OBJECT_TYPE_SYMLINK:

-                                               in->variant.symlink_variant.alias =
+                                               in->variant.symlink_variant.
+                                                   alias =

                                                    yaffs_clone_str(oh->alias);
                                                    yaffs_clone_str(oh->alias);

-                                               if (!in->variant.symlink_variant.alias)
+                                               if (!in->variant.
+                                                   symlink_variant.alias)

                                                        alloc_failed = 1;
                                                break;
                                        }
                                                        alloc_failed = 1;
                                                break;
                                        }


@@ -390,12 +373,12 @@ int yaffs1_scan(struct yaffs_dev *dev)
                }
 
                if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
                }
 
                if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {

-                       /* If we got this far while scanning, then the block is fully allocated.*/
+                       /* If we got this far while scanning, then the block is fully allocated. */

                        state = YAFFS_BLOCK_STATE_FULL;
                }
 
                if (state == YAFFS_BLOCK_STATE_ALLOCATING) {
                        state = YAFFS_BLOCK_STATE_FULL;
                }
 
                if (state == YAFFS_BLOCK_STATE_ALLOCATING) {

-                       /* If the block was partially allocated then treat it as fully allocated.*/
+                       /* If the block was partially allocated then treat it as fully allocated. */

                        state = YAFFS_BLOCK_STATE_FULL;
                        dev->alloc_block = -1;
                }
                        state = YAFFS_BLOCK_STATE_FULL;
                        dev->alloc_block = -1;
                }


@@ -411,7 +394,6 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
        }
 
 
        }
 

-

        /* Ok, we've done all the scanning.
         * Fix up the hard link chains.
         * We should now have scanned all the objects, now it's time to add these
        /* Ok, we've done all the scanning.
         * Fix up the hard link chains.
         * We should now have scanned all the objects, now it's time to add these


@@ -451,7 +433,5 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
        T(YAFFS_TRACE_SCAN, (TSTR("yaffs1_scan ends" TENDSTR)));
 
 
        T(YAFFS_TRACE_SCAN, (TSTR("yaffs1_scan ends" TENDSTR)));
 

-

        return YAFFS_OK;
 }
        return YAFFS_OK;
 }

-