X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_packedtags2.c;fp=yaffs_packedtags2.c;h=4ec5e59eb61d5d27136beab944493e7e024dec61;hp=2bb31b0707e49e39538aab5577c6dabf47075281;hb=6500cebaa2c93512d544719956af259ca13f83b7;hpb=6120ba5a0a029e945f4a2e7e5955896f112d4adc diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c index 2bb31b0..4ec5e59 100644 --- a/yaffs_packedtags2.c +++ b/yaffs_packedtags2.c @@ -100,9 +100,8 @@ void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt, if (tags_ecc) yaffs_ecc_calc_other((unsigned char *)&pt->t, - sizeof(struct - yaffs_packed_tags2_tags_only), - &pt->ecc); + sizeof(struct yaffs_packed_tags2_tags_only), + &pt->ecc); } void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t, @@ -111,37 +110,34 @@ void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t, memset(t, 0, sizeof(struct yaffs_ext_tags)); yaffs_init_tags(t); - if (ptt->seq_number != 0xFFFFFFFF) { - 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->is_deleted = 0; - t->serial_number = 0; - t->seq_number = ptt->seq_number; - - /* Do extra header info stuff */ - if (ptt->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->obj_id &= ~EXTRA_OBJECT_TYPE_MASK; - - if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK) - t->extra_equiv_id = ptt->n_bytes; - else - t->extra_length = ptt->n_bytes; - } + if (ptt->seq_number == 0xFFFFFFFF) + return; + + 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->is_deleted = 0; + t->serial_number = 0; + t->seq_number = ptt->seq_number; + + /* Do extra header info stuff */ + if (ptt->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->obj_id &= ~EXTRA_OBJECT_TYPE_MASK; + + if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK) + t->extra_equiv_id = ptt->n_bytes; + else + t->extra_length = ptt->n_bytes; } yaffs_dump_packed_tags2_tags_only(ptt); yaffs_dump_tags2(t);