/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-2011 Aleph One Ltd.
- * for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
#include "yaffs_packedtags2.h"
#include "yportenv.h"
#include "yaffs_trace.h"
-#include "yaffs_tagsvalidity.h"
+#include "yaffs_endian.h"
/* This code packs a set of extended tags into a binary structure for
* NAND storage
static void yaffs_dump_packed_tags2_tags_only(
const struct yaffs_packed_tags2_tags_only *ptt)
{
+ (void) ptt;
+
yaffs_trace(YAFFS_TRACE_MTD,
"packed tags obj %d chunk %d byte %d seq %d",
ptt->obj_id, ptt->chunk_id, ptt->n_bytes, ptt->seq_number);
static void yaffs_dump_tags2(const struct yaffs_ext_tags *t)
{
+
+ (void) t;
yaffs_trace(YAFFS_TRACE_MTD,
"ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d",
t->ecc_result, t->block_bad, t->chunk_used, t->obj_id,
}
-void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt,
+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_dev *dev,
+ struct yaffs_packed_tags2_tags_only *ptt,
const struct yaffs_ext_tags *t)
{
ptt->chunk_id = t->chunk_id;
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;
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;
}
yaffs_dump_packed_tags2_tags_only(ptt);
yaffs_dump_tags2(t);
+ yaffs_do_endian_packed_tags2(dev, ptt);
}
-void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt,
+void yaffs_pack_tags2(struct yaffs_dev *dev,
+ struct yaffs_packed_tags2 *pt,
const struct yaffs_ext_tags *t, int tags_ecc)
{
- yaffs_pack_tags2_tags_only(&pt->t, t);
+ yaffs_pack_tags2_tags_only(dev, &pt->t, t);
if (tags_ecc)
yaffs_ecc_calc_other((unsigned char *)&pt->t,
&pt->ecc);
}
-void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
- struct yaffs_packed_tags2_tags_only *ptt)
+void yaffs_unpack_tags2_tags_only(struct yaffs_dev *dev,
+ struct yaffs_ext_tags *t,
+ struct yaffs_packed_tags2_tags_only *ptt_ptr)
{
+ struct yaffs_packed_tags2_tags_only ptt_copy = *ptt_ptr;
+
memset(t, 0, sizeof(struct yaffs_ext_tags));
- yaffs_init_tags(t);
- if (ptt->seq_number == 0xffffffff)
+ if (ptt_copy.seq_number == 0xffffffff)
return;
+ yaffs_do_endian_packed_tags2(dev, &ptt_copy);
+
t->block_bad = 0;
t->chunk_used = 1;
- t->obj_id = ptt->obj_id;
- t->chunk_id = ptt->chunk_id;
- t->n_bytes = ptt->n_bytes;
+ t->obj_id = ptt_copy.obj_id;
+ t->chunk_id = ptt_copy.chunk_id;
+ t->n_bytes = ptt_copy.n_bytes;
t->is_deleted = 0;
t->serial_number = 0;
- t->seq_number = ptt->seq_number;
+ t->seq_number = ptt_copy.seq_number;
/* Do extra header info stuff */
- if (ptt->chunk_id & EXTRA_HEADER_INFO_FLAG) {
+ if (ptt_copy.chunk_id & EXTRA_HEADER_INFO_FLAG) {
t->chunk_id = 0;
t->n_bytes = 0;
t->extra_available = 1;
- t->extra_parent_id = ptt->chunk_id & (~(ALL_EXTRA_FLAGS));
- t->extra_is_shrink = ptt->chunk_id & EXTRA_SHRINK_FLAG ? 1 : 0;
- t->extra_shadows = ptt->chunk_id & EXTRA_SHADOWS_FLAG ? 1 : 0;
- t->extra_obj_type = ptt->obj_id >> EXTRA_OBJECT_TYPE_SHIFT;
+ t->extra_parent_id = ptt_copy.chunk_id & (~(ALL_EXTRA_FLAGS));
+ t->extra_is_shrink = ptt_copy.chunk_id & EXTRA_SHRINK_FLAG ? 1 : 0;
+ t->extra_shadows = ptt_copy.chunk_id & EXTRA_SHADOWS_FLAG ? 1 : 0;
+ t->extra_obj_type = ptt_copy.obj_id >> EXTRA_OBJECT_TYPE_SHIFT;
t->obj_id &= ~EXTRA_OBJECT_TYPE_MASK;
if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
- t->extra_equiv_id = ptt->n_bytes;
+ t->extra_equiv_id = ptt_copy.n_bytes;
else
- t->extra_length = ptt->n_bytes;
+ t->extra_file_size = ptt_copy.n_bytes;
}
- yaffs_dump_packed_tags2_tags_only(ptt);
+ yaffs_dump_packed_tags2_tags_only(ptt_ptr);
yaffs_dump_tags2(t);
}
-void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
+void yaffs_unpack_tags2(struct yaffs_dev *dev,
+ struct yaffs_ext_tags *t,
+ struct yaffs_packed_tags2 *pt,
int tags_ecc)
{
enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
}
}
- yaffs_unpack_tags2_tags_only(t, &pt->t);
+ yaffs_unpack_tags2_tags_only(dev, t, &pt->t);
t->ecc_result = ecc_result;