yaffs2: Yaffs endian support

[yaffs2.git] / yaffs_yaffs1.c

diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c
index da6a40ff96f26ff8def4e0dfd7f2525966d4c7c5..e98d04d434a3b9c68bcc5c2c1db7e21f5d024153 100644 (file)
--- a/yaffs_yaffs1.c
+++ b/yaffs_yaffs1.c
@@ -162,15 +162,15 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                if (in &&
                                    in->variant_type ==
                                     YAFFS_OBJECT_TYPE_FILE &&
                                if (in &&
                                    in->variant_type ==
                                     YAFFS_OBJECT_TYPE_FILE &&

-                                   in->variant.file_variant.scanned_size <
+                                   in->variant.file_variant.stored_size <

                                      endpos) {
                                      endpos) {

-                                       in->variant.file_variant.scanned_size =
+                                       in->variant.file_variant.stored_size =

                                            endpos;
                                        if (!dev->param.use_header_file_size) {
                                                in->variant.
                                                    file_variant.file_size =
                                                    in->variant.
                                            endpos;
                                        if (!dev->param.use_header_file_size) {
                                                in->variant.
                                                    file_variant.file_size =
                                                    in->variant.

-                                                   file_variant.scanned_size;
+                                                   file_variant.stored_size;

                                        }
 
                                }
                                        }
 
                                }


@@ -323,11 +323,9 @@ int yaffs1_scan(struct yaffs_dev *dev)
                                        case YAFFS_OBJECT_TYPE_FILE:
                                                if (dev->param.
                                                    use_header_file_size)
                                        case YAFFS_OBJECT_TYPE_FILE:
                                                if (dev->param.
                                                    use_header_file_size)

-

                                                        in->variant.
                                                        in->variant.

-                                                        file_variant.file_size
-                                                           = oh->file_size;
-
+                                                       file_variant.file_size
+                                                       = yaffs_oh_to_size(dev, oh, 0);

                                                break;
                                        case YAFFS_OBJECT_TYPE_HARDLINK:
                                                in->variant.
                                                break;
                                        case YAFFS_OBJECT_TYPE_HARDLINK:
                                                in->variant.