Fix some statics and remove unused function

[yaffs2.git] / yaffs_packedtags2.c

diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c
index ad608406a49ad51de4677b6c70e18af760c29ce9..e1d18cc33c683ebc1ba53fc18841b60040b46f84 100644 (file)
--- a/yaffs_packedtags2.c
+++ b/yaffs_packedtags2.c
@@ -14,7 +14,6 @@
 #include "yaffs_packedtags2.h"
 #include "yportenv.h"
 #include "yaffs_trace.h"
-#include "yaffs_tagsvalidity.h"
 
 /* This code packs a set of extended tags into a binary structure for
  * NAND storage
@@ -32,11 +31,11 @@
 #define EXTRA_SHADOWS_FLAG     0x20000000
 #define EXTRA_SPARE_FLAGS      0x10000000
 
-#define ALL_EXTRA_FLAGS                0xF0000000
+#define ALL_EXTRA_FLAGS                0xf0000000
 
 /* Also, the top 4 bits of the object Id are set to the object type. */
 #define EXTRA_OBJECT_TYPE_SHIFT (28)
-#define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
+#define EXTRA_OBJECT_TYPE_MASK  ((0x0f) << EXTRA_OBJECT_TYPE_SHIFT)
 
 static void yaffs_dump_packed_tags2_tags_only(
                                const struct yaffs_packed_tags2_tags_only *ptt)
@@ -61,6 +60,18 @@ static void yaffs_dump_tags2(const struct yaffs_ext_tags *t)
 
 }
 
+static int yaffs_check_tags_extra_packable(const struct yaffs_ext_tags *t)
+{
+       if (t->chunk_id != 0 || !t->extra_available)
+               return 0;
+
+       /* Check if the file size is too long to store */
+       if (t->extra_obj_type == YAFFS_OBJECT_TYPE_FILE &&
+           (t->extra_file_size >> 31) != 0)
+               return 0;
+       return 1;
+}
+
 void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt,
                                const struct yaffs_ext_tags *t)
 {
@@ -69,7 +80,11 @@ void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt,
        ptt->n_bytes = t->n_bytes;
        ptt->obj_id = t->obj_id;
 
-       if (t->chunk_id == 0 && t->extra_available) {
+       /* Only store extra tags for object headers.
+        * If it is a file then only store  if the file size is short\
+        * enough to fit.
+        */
+       if (yaffs_check_tags_extra_packable(t)) {
                /* Store the extra header info instead */
                /* We save the parent object in the chunk_id */
                ptt->chunk_id = EXTRA_HEADER_INFO_FLAG | t->extra_parent_id;
@@ -84,7 +99,7 @@ void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt,
                if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
                        ptt->n_bytes = t->extra_equiv_id;
                else if (t->extra_obj_type == YAFFS_OBJECT_TYPE_FILE)
-                       ptt->n_bytes = t->extra_length;
+                       ptt->n_bytes = (unsigned) t->extra_file_size;
                else
                        ptt->n_bytes = 0;
        }
@@ -108,9 +123,8 @@ void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
                                  struct yaffs_packed_tags2_tags_only *ptt)
 {
        memset(t, 0, sizeof(struct yaffs_ext_tags));
-       yaffs_init_tags(t);
 
-       if (ptt->seq_number == 0xFFFFFFFF)
+       if (ptt->seq_number == 0xffffffff)
                return;
 
        t->block_bad = 0;
@@ -137,7 +151,7 @@ void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
                if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
                        t->extra_equiv_id = ptt->n_bytes;
                else
-                       t->extra_length = ptt->n_bytes;
+                       t->extra_file_size = ptt->n_bytes;
        }
        yaffs_dump_packed_tags2_tags_only(ptt);
        yaffs_dump_tags2(t);
@@ -148,7 +162,7 @@ void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
 {
        enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
 
-       if (pt->t.seq_number != 0xFFFFFFFF && tags_ecc) {
+       if (pt->t.seq_number != 0xffffffff && tags_ecc) {
                /* Chunk is in use and we need to do ECC */
 
                struct yaffs_ecc_other ecc;