diff options
Diffstat (limited to 'yaffs_guts.c')
| -rw-r--r-- | yaffs_guts.c | 2277 |
1 files changed, 1052 insertions, 1225 deletions
diff --git a/yaffs_guts.c b/yaffs_guts.c index 486b7e0..9ade09b 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2010 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning <charles@aleph1.co.uk> @@ -15,25 +15,19 @@ #include "yaffs_trace.h" #include "yaffs_guts.h" -#include "yaffs_tagsvalidity.h" #include "yaffs_getblockinfo.h" - #include "yaffs_tagscompat.h" - #include "yaffs_nand.h" - #include "yaffs_yaffs1.h" #include "yaffs_yaffs2.h" #include "yaffs_bitmap.h" #include "yaffs_verify.h" - #include "yaffs_nand.h" #include "yaffs_packedtags2.h" - #include "yaffs_nameval.h" #include "yaffs_allocator.h" - #include "yaffs_attribs.h" +#include "yaffs_summary.h" /* Note YAFFS_GC_GOOD_ENOUGH must be <= YAFFS_GC_PASSIVE_THRESHOLD */ #define YAFFS_GC_GOOD_ENOUGH 2 @@ -44,14 +38,14 @@ /* Forward declarations */ static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk, - const u8 * buffer, int n_bytes, int use_reserve); + const u8 *buffer, int n_bytes, int use_reserve); /* Function to calculate chunk and offset */ -static void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr, - int *chunk_out, u32 * offset_out) +static inline void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr, + int *chunk_out, u32 *offset_out) { int chunk; u32 offset; @@ -82,7 +76,7 @@ static void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr, * be hellishly efficient. */ -static u32 calc_shifts_ceiling(u32 x) +static inline u32 calc_shifts_ceiling(u32 x) { int extra_bits; int shifts; @@ -105,7 +99,7 @@ static u32 calc_shifts_ceiling(u32 x) /* Function to return the number of shifts to get a 1 in bit 0 */ -static u32 calc_shifts(u32 x) +static inline u32 calc_shifts(u32 x) { u32 shifts; @@ -134,42 +128,30 @@ static int yaffs_init_tmp_buffers(struct yaffs_dev *dev) memset(dev->temp_buffer, 0, sizeof(dev->temp_buffer)); for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) { - dev->temp_buffer[i].line = 0; /* not in use */ - dev->temp_buffer[i].buffer = buf = - kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS); + dev->temp_buffer[i].in_use = 0; + buf = kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS); + dev->temp_buffer[i].buffer = buf; } return buf ? YAFFS_OK : YAFFS_FAIL; } -u8 *yaffs_get_temp_buffer(struct yaffs_dev * dev, int line_no) +u8 *yaffs_get_temp_buffer(struct yaffs_dev * dev) { - int i, j; + int i; dev->temp_in_use++; if (dev->temp_in_use > dev->max_temp) dev->max_temp = dev->temp_in_use; for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { - if (dev->temp_buffer[i].line == 0) { - dev->temp_buffer[i].line = line_no; - if ((i + 1) > dev->max_temp) { - dev->max_temp = i + 1; - for (j = 0; j <= i; j++) - dev->temp_buffer[j].max_line = - dev->temp_buffer[j].line; - } - + if (dev->temp_buffer[i].in_use == 0) { + dev->temp_buffer[i].in_use = 1; return dev->temp_buffer[i].buffer; } } - yaffs_trace(YAFFS_TRACE_BUFFERS, - "Out of temp buffers at line %d, other held by lines:", - line_no); - for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) - yaffs_trace(YAFFS_TRACE_BUFFERS," %d", dev->temp_buffer[i].line); - + yaffs_trace(YAFFS_TRACE_BUFFERS, "Out of temp buffers"); /* * If we got here then we have to allocate an unmanaged one * This is not good. @@ -180,7 +162,7 @@ u8 *yaffs_get_temp_buffer(struct yaffs_dev * dev, int line_no) } -void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 * buffer, int line_no) +void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 *buffer) { int i; @@ -188,16 +170,14 @@ void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 * buffer, int line_no) for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { if (dev->temp_buffer[i].buffer == buffer) { - dev->temp_buffer[i].line = 0; + dev->temp_buffer[i].in_use = 0; return; } } if (buffer) { /* assume it is an unmanaged one. */ - yaffs_trace(YAFFS_TRACE_BUFFERS, - "Releasing unmanaged temp buffer in line %d", - line_no); + yaffs_trace(YAFFS_TRACE_BUFFERS, "Releasing unmanaged temp buffer"); kfree(buffer); dev->unmanaged_buffer_deallocs++; } @@ -207,7 +187,7 @@ void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 * buffer, int line_no) /* * Determine if we have a managed buffer. */ -int yaffs_is_managed_tmp_buffer(struct yaffs_dev *dev, const u8 * buffer) +int yaffs_is_managed_tmp_buffer(struct yaffs_dev *dev, const u8 *buffer) { int i; @@ -235,7 +215,7 @@ int yaffs_is_managed_tmp_buffer(struct yaffs_dev *dev, const u8 * buffer) */ static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk, - const u8 * data, + const u8 *data, const struct yaffs_ext_tags *tags) { dev = dev; @@ -261,8 +241,9 @@ void yaffs_handle_chunk_error(struct yaffs_dev *dev, bi->chunk_error_strikes++; if (bi->chunk_error_strikes > 3) { - bi->needs_retiring = 1; /* Too many stikes, so retire this */ - yaffs_trace(YAFFS_TRACE_ALWAYS, "yaffs: Block struck out"); + bi->needs_retiring = 1; /* Too many stikes, so retire */ + yaffs_trace(YAFFS_TRACE_ALWAYS, + "yaffs: Block struck out"); } } @@ -277,7 +258,8 @@ static void yaffs_handle_chunk_wr_error(struct yaffs_dev *dev, int nand_chunk, yaffs_handle_chunk_error(dev, bi); if (erased_ok) { - /* Was an actual write failure, so mark the block for retirement */ + /* Was an actual write failure, + * so mark the block for retirement.*/ bi->needs_retiring = 1; yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, "**>> Block %d needs retiring", flash_block); @@ -321,11 +303,11 @@ struct yaffs_obj *yaffs_lost_n_found(struct yaffs_dev *dev) * Erased NAND checking functions */ -int yaffs_check_ff(u8 * buffer, int n_bytes) +int yaffs_check_ff(u8 *buffer, int n_bytes) { /* Horrible, slow implementation */ while (n_bytes--) { - if (*buffer != 0xFF) + if (*buffer != 0xff) return 0; buffer++; } @@ -335,7 +317,7 @@ int yaffs_check_ff(u8 * buffer, int n_bytes) static int yaffs_check_chunk_erased(struct yaffs_dev *dev, int nand_chunk) { int retval = YAFFS_OK; - u8 *data = yaffs_get_temp_buffer(dev, __LINE__); + u8 *data = yaffs_get_temp_buffer(dev); struct yaffs_ext_tags tags; int result; @@ -346,11 +328,12 @@ static int yaffs_check_chunk_erased(struct yaffs_dev *dev, int nand_chunk) if (!yaffs_check_ff(data, dev->data_bytes_per_chunk) || tags.chunk_used) { - yaffs_trace(YAFFS_TRACE_NANDACCESS, "Chunk %d not erased", nand_chunk); + yaffs_trace(YAFFS_TRACE_NANDACCESS, + "Chunk %d not erased", nand_chunk); retval = YAFFS_FAIL; } - yaffs_release_temp_buffer(dev, data, __LINE__); + yaffs_release_temp_buffer(dev, data); return retval; @@ -358,12 +341,12 @@ static int yaffs_check_chunk_erased(struct yaffs_dev *dev, int nand_chunk) static int yaffs_verify_chunk_written(struct yaffs_dev *dev, int nand_chunk, - const u8 * data, + const u8 *data, struct yaffs_ext_tags *tags) { int retval = YAFFS_OK; struct yaffs_ext_tags temp_tags; - u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__); + u8 *buffer = yaffs_get_temp_buffer(dev); int result; result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, buffer, &temp_tags); @@ -373,7 +356,7 @@ static int yaffs_verify_chunk_written(struct yaffs_dev *dev, temp_tags.n_bytes != tags->n_bytes) retval = YAFFS_FAIL; - yaffs_release_temp_buffer(dev, buffer, __LINE__); + yaffs_release_temp_buffer(dev, buffer); return retval; } @@ -388,7 +371,7 @@ int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks) checkpt_blocks = yaffs_calc_checkpt_blocks_required(dev); reserved_chunks = - ((reserved_blocks + checkpt_blocks) * dev->param.chunks_per_block); + (reserved_blocks + checkpt_blocks) * dev->param.chunks_per_block; return (dev->n_free_chunks > (reserved_chunks + n_chunks)); } @@ -396,7 +379,6 @@ int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks) static int yaffs_find_alloc_block(struct yaffs_dev *dev) { int i; - struct yaffs_block_info *bi; if (dev->n_erased_blocks < 1) { @@ -404,7 +386,7 @@ static int yaffs_find_alloc_block(struct yaffs_dev *dev) * Can't get space to gc */ yaffs_trace(YAFFS_TRACE_ERROR, - "yaffs tragedy: no more erased blocks" ); + "yaffs tragedy: no more erased blocks"); return -1; } @@ -453,7 +435,7 @@ static int yaffs_alloc_chunk(struct yaffs_dev *dev, int use_reserver, } if (!use_reserver && !yaffs_check_alloc_available(dev, 1)) { - /* Not enough space to allocate unless we're allowed to use the reserve. */ + /* No space unless we're allowed to use the reserve. */ return -1; } @@ -486,7 +468,8 @@ static int yaffs_alloc_chunk(struct yaffs_dev *dev, int use_reserver, return ret_val; } - yaffs_trace(YAFFS_TRACE_ERROR, "!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" ); + yaffs_trace(YAFFS_TRACE_ERROR, + "!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!"); return -1; } @@ -510,9 +493,10 @@ static int yaffs_get_erased_chunks(struct yaffs_dev *dev) */ void yaffs_skip_rest_of_block(struct yaffs_dev *dev) { + struct yaffs_block_info *bi; + if (dev->alloc_block > 0) { - struct yaffs_block_info *bi = - yaffs_get_block_info(dev, dev->alloc_block); + bi = yaffs_get_block_info(dev, dev->alloc_block); if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING) { bi->block_state = YAFFS_BLOCK_STATE_FULL; dev->alloc_block = -1; @@ -521,7 +505,7 @@ void yaffs_skip_rest_of_block(struct yaffs_dev *dev) } static int yaffs_write_new_chunk(struct yaffs_dev *dev, - const u8 * data, + const u8 *data, struct yaffs_ext_tags *tags, int use_reserver) { int attempts = 0; @@ -560,7 +544,7 @@ static int yaffs_write_new_chunk(struct yaffs_dev *dev, * lot of checks that are most likely not needed. * * Mods to the above - * If an erase check fails or the write fails we skip the + * If an erase check fails or the write fails we skip the * rest of the block. */ @@ -614,7 +598,7 @@ static int yaffs_write_new_chunk(struct yaffs_dev *dev, yaffs_trace(YAFFS_TRACE_ERROR, "**>> yaffs write required %d attempts", attempts); - dev->n_retired_writes += (attempts - 1); + dev->n_retried_writes += (attempts - 1); } return chunk; @@ -642,10 +626,10 @@ static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block) int chunk_id = flash_block * dev->param.chunks_per_block; - u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__); + u8 *buffer = yaffs_get_temp_buffer(dev); memset(buffer, 0xff, dev->data_bytes_per_chunk); - yaffs_init_tags(&tags); + memset(&tags, 0, sizeof(tags)); tags.seq_number = YAFFS_SEQUENCE_BAD_BLOCK; if (dev->param.write_chunk_tags_fn(dev, chunk_id - dev->chunk_offset, @@ -655,7 +639,7 @@ static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block) "yaffs: Failed to write bad block marker to block %d", flash_block); - yaffs_release_temp_buffer(dev, buffer, __LINE__); + yaffs_release_temp_buffer(dev, buffer); } } @@ -668,35 +652,33 @@ static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block) /*---------------- Name handling functions ------------*/ -static u16 yaffs_calc_name_sum(const YCHAR * name) +static u16 yaffs_calc_name_sum(const YCHAR *name) { u16 sum = 0; u16 i = 1; - const YUCHAR *bname = (const YUCHAR *)name; - if (bname) { - while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH / 2))) { + if (!name) + return 0; + + while ((*name) && i < (YAFFS_MAX_NAME_LENGTH / 2)) { - /* 0x1f mask is case insensitive */ - sum += ((*bname) & 0x1f) * i; - i++; - bname++; - } + /* 0x1f mask is case insensitive */ + sum += ((*name) & 0x1f) * i; + i++; + name++; } return sum; } void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name) { -#ifndef CONFIG_YAFFS_NO_SHORT_NAMES memset(obj->short_name, 0, sizeof(obj->short_name)); - if (name && - strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <= - YAFFS_SHORT_NAME_LENGTH) + if (name && + strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <= + YAFFS_SHORT_NAME_LENGTH) strcpy(obj->short_name, name); else obj->short_name[0] = _Y('\0'); -#endif obj->sum = yaffs_calc_name_sum(name); } @@ -724,6 +706,7 @@ void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj, struct yaffs_tnode *yaffs_get_tnode(struct yaffs_dev *dev) { struct yaffs_tnode *tn = yaffs_alloc_raw_tnode(dev); + if (tn) { memset(tn, 0, dev->tnode_size); dev->n_tnodes++; @@ -772,9 +755,9 @@ void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn, if (dev->tnode_width > (32 - bit_in_word)) { bit_in_word = (32 - bit_in_word); - word_in_map++;; + word_in_map++; mask = - dev->tnode_mask >> ( /*dev->tnode_width - */ bit_in_word); + dev->tnode_mask >> bit_in_word; map[word_in_map] &= ~mask; map[word_in_map] |= (mask & (val >> bit_in_word)); } @@ -799,7 +782,7 @@ u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn, if (dev->tnode_width > (32 - bit_in_word)) { bit_in_word = (32 - bit_in_word); - word_in_map++;; + word_in_map++; val |= (map[word_in_map] << bit_in_word); } @@ -860,15 +843,16 @@ struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev, return tn; } -/* AddOrFindLevel0Tnode finds the level 0 tnode if it exists, otherwise first expands the tree. +/* add_find_tnode_0 finds the level 0 tnode if it exists, + * otherwise first expands the tree. * This happens in two steps: * 1. If the tree isn't tall enough, then make it taller. * 2. Scan down the tree towards the level 0 tnode adding tnodes if required. * * Used when modifying the tree. * - * If the tn argument is NULL, then a fresh tnode will be added otherwise the specified tn will - * be plugged into the ttree. + * If the tn argument is NULL, then a fresh tnode will be added otherwise the + * specified tn will be plugged into the ttree. */ struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev, @@ -880,12 +864,11 @@ struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev, int i; int l; struct yaffs_tnode *tn; - u32 x; /* Check sane level and page Id */ - if (file_struct->top_level < 0 - || file_struct->top_level > YAFFS_TNODES_MAX_LEVEL) + if (file_struct->top_level < 0 || + file_struct->top_level > YAFFS_TNODES_MAX_LEVEL) return NULL; if (chunk_id > YAFFS_MAX_CHUNK_ID) @@ -911,7 +894,8 @@ struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev, file_struct->top = tn; file_struct->top_level++; } else { - yaffs_trace(YAFFS_TRACE_ERROR, "yaffs: no more tnodes"); + yaffs_trace(YAFFS_TRACE_ERROR, + "yaffs: no more tnodes"); return NULL; } } @@ -937,11 +921,10 @@ struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev, } else if (l == 1) { /* Looking from level 1 at level 0 */ if (passed_tn) { - /* If we already have one, then release it. */ + /* If we already have one, release it */ if (tn->internal[x]) yaffs_free_tnode(dev, - tn-> - internal[x]); + tn->internal[x]); tn->internal[x] = passed_tn; } else if (!tn->internal[x]) { @@ -971,13 +954,14 @@ static int yaffs_tags_match(const struct yaffs_ext_tags *tags, int obj_id, int chunk_obj) { return (tags->chunk_id == chunk_obj && - tags->obj_id == obj_id && !tags->is_deleted) ? 1 : 0; + tags->obj_id == obj_id && + !tags->is_deleted) ? 1 : 0; } static int yaffs_find_chunk_in_group(struct yaffs_dev *dev, int the_chunk, - struct yaffs_ext_tags *tags, int obj_id, - int inode_chunk) + struct yaffs_ext_tags *tags, int obj_id, + int inode_chunk) { int j; @@ -991,7 +975,8 @@ static int yaffs_find_chunk_in_group(struct yaffs_dev *dev, int the_chunk, else { yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL, tags); - if (yaffs_tags_match(tags, obj_id, inode_chunk)) { + if (yaffs_tags_match(tags, + obj_id, inode_chunk)) { /* found it; */ return the_chunk; } @@ -1010,7 +995,6 @@ static int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk, int the_chunk = -1; struct yaffs_ext_tags local_tags; int ret_val = -1; - struct yaffs_dev *dev = in->my_dev; if (!tags) { @@ -1020,13 +1004,13 @@ static int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk, tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk); - if (tn) { - the_chunk = yaffs_get_group_base(dev, tn, inode_chunk); + if (!tn) + return ret_val; - ret_val = - yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id, + the_chunk = yaffs_get_group_base(dev, tn, inode_chunk); + + ret_val = yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id, inode_chunk); - } return ret_val; } @@ -1037,7 +1021,6 @@ static int yaffs_find_del_file_chunk(struct yaffs_obj *in, int inode_chunk, struct yaffs_tnode *tn; int the_chunk = -1; struct yaffs_ext_tags local_tags; - struct yaffs_dev *dev = in->my_dev; int ret_val = -1; @@ -1048,18 +1031,17 @@ static int yaffs_find_del_file_chunk(struct yaffs_obj *in, int inode_chunk, tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk); - if (tn) { + if (!tn) + return ret_val; - the_chunk = yaffs_get_group_base(dev, tn, inode_chunk); + the_chunk = yaffs_get_group_base(dev, tn, inode_chunk); - ret_val = - yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id, + ret_val = yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id, inode_chunk); - /* Delete the entry in the filestructure (if found) */ - if (ret_val != -1) - yaffs_load_tnode_0(dev, tn, inode_chunk, 0); - } + /* Delete the entry in the filestructure (if found) */ + if (ret_val != -1) + yaffs_load_tnode_0(dev, tn, inode_chunk, 0); return ret_val; } @@ -1082,14 +1064,15 @@ int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk, unsigned existing_serial, new_serial; if (in->variant_type != YAFFS_OBJECT_TYPE_FILE) { - /* Just ignore an attempt at putting a chunk into a non-file during scanning + /* Just ignore an attempt at putting a chunk into a non-file + * during scanning. * If it is not during Scanning then something went wrong! */ if (!in_scan) { yaffs_trace(YAFFS_TRACE_ERROR, "yaffs tragedy:attempt to put data chunk into a non-file" ); - YBUG(); + BUG(); } yaffs_chunk_del(dev, nand_chunk, 1, __LINE__); @@ -1110,23 +1093,29 @@ int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk, if (in_scan != 0) { /* If we're scanning then we need to test for duplicates - * NB This does not need to be efficient since it should only ever + * NB This does not need to be efficient since it should only * happen when the power fails during a write, then only one * chunk should ever be affected. * - * Correction for YAFFS2: This could happen quite a lot and we need to think about efficiency! TODO - * Update: For backward scanning we don't need to re-read tags so this is quite cheap. + * Correction for YAFFS2: This could happen quite a lot and we + * need to think about efficiency! TODO + * Update: For backward scanning we don't need to re-read tags + * so this is quite cheap. */ if (existing_cunk > 0) { - /* NB Right now existing chunk will not be real chunk_id if the chunk group size > 1 - * thus we have to do a FindChunkInFile to get the real chunk id. + /* NB Right now existing chunk will not be real + * chunk_id if the chunk group size > 1 + * thus we have to do a FindChunkInFile to get the + * real chunk id. * - * We have a duplicate now we need to decide which one to use: + * We have a duplicate now we need to decide which + * one to use: * - * Backwards scanning YAFFS2: The old one is what we use, dump the new one. - * Forward scanning YAFFS2: The new one is what we use, dump the old one. - * YAFFS1: Get both sets of tags and compare serial numbers. + * Backwards scanning YAFFS2: The old one is what + * we use, dump the new one. + * YAFFS1: Get both sets of tags and compare serial + * numbers. */ if (in_scan > 0) { @@ -1150,8 +1139,8 @@ int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk, } - /* NB The deleted flags should be false, otherwise the chunks will - * not be loaded during a scan + /* NB The deleted flags should be false, otherwise + * the chunks will not be loaded during a scan */ if (in_scan > 0) { @@ -1164,14 +1153,16 @@ int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk, ((existing_serial + 1) & 3) == new_serial)) { /* Forward scanning. * Use new - * Delete the old one and drop through to update the tnode + * Delete the old one and drop through to + * update the tnode */ yaffs_chunk_del(dev, existing_cunk, 1, __LINE__); } else { - /* Backward scanning or we want to use the existing one - * Use existing. - * Delete the new one and return early so that the tnode isn't changed + /* Backward scanning or we want to use the + * existing one + * Delete the new one and return early so that + * the tnode isn't changed */ yaffs_chunk_del(dev, nand_chunk, 1, __LINE__); return YAFFS_OK; @@ -1204,10 +1195,12 @@ static void yaffs_soft_del_chunk(struct yaffs_dev *dev, int chunk) } } -/* SoftDeleteWorker scans backwards through the tnode tree and soft deletes all the chunks in the file. - * All soft deleting does is increment the block's softdelete count and pulls the chunk out - * of the tnode. - * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted. +/* SoftDeleteWorker scans backwards through the tnode tree and soft deletes all + * the chunks in the file. + * All soft deleting does is increment the block's softdelete count and pulls + * the chunk out of the tnode. + * Thus, essentially this is the same as DeleteWorker except that the chunks + * are soft deleted. */ static int yaffs_soft_del_worker(struct yaffs_obj *in, struct yaffs_tnode *tn, @@ -1218,54 +1211,42 @@ static int yaffs_soft_del_worker(struct yaffs_obj *in, struct yaffs_tnode *tn, int all_done = 1; struct yaffs_dev *dev = in->my_dev; - if (tn) { - if (level > 0) { - - for (i = YAFFS_NTNODES_INTERNAL - 1; all_done && i >= 0; - i--) { - if (tn->internal[i]) { - all_done = - yaffs_soft_del_worker(in, - tn->internal - [i], - level - 1, - (chunk_offset - << - YAFFS_TNODES_INTERNAL_BITS) - + i); - if (all_done) { - yaffs_free_tnode(dev, - tn->internal - [i]); - tn->internal[i] = NULL; - } else { - /* Hoosterman... how could this happen? */ - } - } - } - return (all_done) ? 1 : 0; - } else if (level == 0) { - - for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) { - the_chunk = yaffs_get_group_base(dev, tn, i); - if (the_chunk) { - /* Note this does not find the real chunk, only the chunk group. - * We make an assumption that a chunk group is not larger than - * a block. - */ - yaffs_soft_del_chunk(dev, the_chunk); - yaffs_load_tnode_0(dev, tn, i, 0); - } + if (!tn) + return 1; + if (level > 0) { + for (i = YAFFS_NTNODES_INTERNAL - 1; + all_done && i >= 0; + i--) { + if (tn->internal[i]) { + all_done = + yaffs_soft_del_worker(in, + tn->internal[i], + level - 1, + (chunk_offset << + YAFFS_TNODES_INTERNAL_BITS) + + i); + if (all_done) { + yaffs_free_tnode(dev, + tn->internal[i]); + tn->internal[i] = NULL; + } else { + /* Can this happen? */ + } } - return 1; - } - + return (all_done) ? 1 : 0; } + /* level 0 */ + for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) { + the_chunk = yaffs_get_group_base(dev, tn, i); + if (the_chunk) { + yaffs_soft_del_chunk(dev, the_chunk); + yaffs_load_tnode_0(dev, tn, i, 0); + } + } return 1; - } static void yaffs_remove_obj_from_dir(struct yaffs_obj *obj) @@ -1293,19 +1274,19 @@ void yaffs_add_obj_to_dir(struct yaffs_obj *directory, struct yaffs_obj *obj) yaffs_trace(YAFFS_TRACE_ALWAYS, "tragedy: Trying to add an object to a null pointer directory" ); - YBUG(); + BUG(); return; } if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) { yaffs_trace(YAFFS_TRACE_ALWAYS, "tragedy: Trying to add an object to a non-directory" ); - YBUG(); + BUG(); } if (obj->siblings.prev == NULL) { /* Not initialised */ - YBUG(); + BUG(); } yaffs_verify_dir(directory); @@ -1329,11 +1310,10 @@ void yaffs_add_obj_to_dir(struct yaffs_obj *directory, struct yaffs_obj *obj) static int yaffs_change_obj_name(struct yaffs_obj *obj, struct yaffs_obj *new_dir, - const YCHAR * new_name, int force, int shadows) + const YCHAR *new_name, int force, int shadows) { int unlink_op; int del_op; - struct yaffs_obj *existing_target; if (new_dir == NULL) @@ -1343,58 +1323,48 @@ static int yaffs_change_obj_name(struct yaffs_obj *obj, yaffs_trace(YAFFS_TRACE_ALWAYS, "tragedy: yaffs_change_obj_name: new_dir is not a directory" ); - YBUG(); + BUG(); } - /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */ - if (obj->my_dev->param.is_yaffs2) - unlink_op = (new_dir == obj->my_dev->unlinked_dir); - else - unlink_op = (new_dir == obj->my_dev->unlinked_dir - && obj->variant_type == YAFFS_OBJECT_TYPE_FILE); - + unlink_op = (new_dir == obj->my_dev->unlinked_dir); del_op = (new_dir == obj->my_dev->del_dir); existing_target = yaffs_find_by_name(new_dir, new_name); /* If the object is a file going into the unlinked directory, - * then it is OK to just stuff it in since duplicate names are allowed. - * else only proceed if the new name does not exist and if we're putting + * then it is OK to just stuff it in since duplicate names are OK. + * else only proceed if the new name does not exist and we're putting * it into a directory. */ - if ((unlink_op || - del_op || - force || - (shadows > 0) || - !existing_target) && - new_dir->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) { - yaffs_set_obj_name(obj, new_name); - obj->dirty = 1; + if (!(unlink_op || del_op || force || + shadows > 0 || !existing_target) || + new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) + return YAFFS_FAIL; - yaffs_add_obj_to_dir(new_dir, obj); + yaffs_set_obj_name(obj, new_name); + obj->dirty = 1; + yaffs_add_obj_to_dir(new_dir, obj); - if (unlink_op) - obj->unlinked = 1; + if (unlink_op) + obj->unlinked = 1; - /* If it is a deletion then we mark it as a shrink for gc purposes. */ - if (yaffs_update_oh(obj, new_name, 0, del_op, shadows, NULL) >= - 0) - return YAFFS_OK; - } + /* If it is a deletion then we mark it as a shrink for gc */ + if (yaffs_update_oh(obj, new_name, 0, del_op, shadows, NULL) >= 0) + return YAFFS_OK; return YAFFS_FAIL; } -/*------------------------ Short Operations Cache ---------------------------------------- +/*------------------------ Short Operations Cache ------------------------------ * In many situations where there is no high level buffering a lot of * reads might be short sequential reads, and a lot of writes may be short * sequential writes. eg. scanning/writing a jpeg file. * In these cases, a short read/write cache can provide a huge perfomance * benefit with dumb-as-a-rock code. - * In Linux, the page cache provides read buffering and the short op cache + * In Linux, the page cache provides read buffering and the short op cache * provides write buffering. * - * There are a limited number (~10) of cache chunks per device so that we don't + * There are a small number (~10) of cache chunks per device so that we don't * need a very intelligent search. */ @@ -1423,44 +1393,39 @@ static void yaffs_flush_file_cache(struct yaffs_obj *obj) int chunk_written = 0; int n_caches = obj->my_dev->param.n_caches; - if (n_caches > 0) { - do { - cache = NULL; - - /* Find the dirty cache for this object with the lowest chunk id. */ - for (i = 0; i < n_caches; i++) { - if (dev->cache[i].object == obj && - dev->cache[i].dirty) { - if (!cache - || dev->cache[i].chunk_id < - lowest) { - cache = &dev->cache[i]; - lowest = cache->chunk_id; - } - } - } - - if (cache && !cache->locked) { - /* Write it out and free it up */ + if (n_caches < 1) + return; + do { + cache = NULL; - chunk_written = - yaffs_wr_data_obj(cache->object, - cache->chunk_id, - cache->data, - cache->n_bytes, 1); - cache->dirty = 0; - cache->object = NULL; + /* Find the lowest dirty chunk for this object */ + for (i = 0; i < n_caches; i++) { + if (dev->cache[i].object == obj && + dev->cache[i].dirty) { + if (!cache || + dev->cache[i].chunk_id < lowest) { + cache = &dev->cache[i]; + lowest = cache->chunk_id; + } } + } - } while (cache && chunk_written > 0); - - if (cache) - /* Hoosterman, disk full while writing cache out. */ - yaffs_trace(YAFFS_TRACE_ERROR, - "yaffs tragedy: no space during cache write"); - - } + if (cache && !cache->locked) { + /* Write it out and free it up */ + chunk_written = + yaffs_wr_data_obj(cache->object, + cache->chunk_id, + cache->data, + cache->n_bytes, 1); + cache->dirty = 0; + cache->object = NULL; + } + } while (cache && chunk_written > 0); + if (cache) + /* Hoosterman, disk full while writing cache out. */ + yaffs_trace(YAFFS_TRACE_ERROR, + "yaffs tragedy: no space during cache write"); } /*yaffs_flush_whole_cache(dev) @@ -1482,11 +1447,9 @@ void yaffs_flush_whole_cache(struct yaffs_dev *dev) for (i = 0; i < n_caches && !obj; i++) { if (dev->cache[i].object && dev->cache[i].dirty) obj = dev->cache[i].object; - } if (obj) yaffs_flush_file_cache(obj); - } while (obj); } @@ -1506,7 +1469,6 @@ static struct yaffs_cache *yaffs_grab_chunk_worker(struct yaffs_dev *dev) return &dev->cache[i]; } } - return NULL; } @@ -1518,48 +1480,46 @@ static struct yaffs_cache *yaffs_grab_chunk_cache(struct yaffs_dev *dev) int i; int pushout; - if (dev->param.n_caches > 0) { - /* Try find a non-dirty one... */ - - cache = yaffs_grab_chunk_worker(dev); + if (dev->param.n_caches < 1) + return NULL; - if (!cache) { - /* They were all dirty, find the last recently used object and flush - * its cache, then find again. - * NB what's here is not very accurate, we actually flush the object - * the last recently used page. - */ + /* Try find a non-dirty one... */ - /* With locking we can't assume we can use entry zero */ + cache = yaffs_grab_chunk_worker(dev); - the_obj = dev->cache[0].object; - usage = -1; - cache = NULL; - pushout = -1; + if (!cache) { + /* They were all dirty, find the LRU object and flush + * its cache, then find again. + * NB what's here is not very accurate, + * we actually flush the object with the LRU chunk. + */ - for (i = 0; i < dev->param.n_caches; i++) { - if (dev->cache[i].object && - !dev->cache[i].locked && - (dev->cache[i].last_use < usage - || !cache)) { - usage = dev->cache[i].last_use; - the_obj = dev->cache[i].object; - cache = &dev->cache[i]; - pushout = i; - } - } + /* With locking we can't assume we can use entry zero, + * Set the_obj to a valid pointer for Coverity. */ + the_obj = dev->cache[0].object; + usage = -1; + cache = NULL; + pushout = -1; - if (!cache || cache->dirty) { - /* Flush and try again */ - yaffs_flush_file_cache(the_obj); - cache = yaffs_grab_chunk_worker(dev); + for (i = 0; i < dev->param.n_caches; i++) { + if (dev->cache[i].object && + !dev->cache[i].locked && + (dev->cache[i].last_use < usage || + !cache)) { + usage = dev->cache[i].last_use; + the_obj = dev->cache[i].object; + cache = &dev->cache[i]; + pushout = i; } + } + if (!cache || cache->dirty) { + /* Flush and try again */ + yaffs_flush_file_cache(the_obj); + cache = yaffs_grab_chunk_worker(dev); } - return cache; - } else { - return NULL; - } + } + return cache; } /* Find a cached chunk */ @@ -1568,14 +1528,16 @@ static struct yaffs_cache *yaffs_find_chunk_cache(const struct yaffs_obj *obj, { struct yaffs_dev *dev = obj->my_dev; int i; - if (dev->param.n_caches > 0) { - for (i = 0; i < dev->param.n_caches; i++) { - if (dev->cache[i].object == obj && - dev->cache[i].chunk_id == chunk_id) { - dev->cache_hits++; - return &dev->cache[i]; - } + if (dev->param.n_caches < 1) + return NULL; + + for (i = 0; i < dev->param.n_caches; i++) { + if (dev->cache[i].object == obj && + dev->cache[i].chunk_id == chunk_id) { + dev->cache_hits++; + + return &dev->cache[i]; } } return NULL; @@ -1585,24 +1547,24 @@ static struct yaffs_cache *yaffs_find_chunk_cache(const struct yaffs_obj *obj, static void yaffs_use_cache(struct yaffs_dev *dev, struct yaffs_cache *cache, int is_write) { + int i; - if (dev->param.n_caches > 0) { - if (dev->cache_last_use < 0 || dev->cache_last_use > 100000000) { - /* Reset the cache usages */ - int i; - for (i = 1; i < dev->param.n_caches; i++) - dev->cache[i].last_use = 0; - - dev->cache_last_use = 0; - } - - dev->cache_last_use++; + if (dev->param.n_caches < 1) + return; - cache->last_use = dev->cache_last_use; + if (dev->cache_last_use < 0 || + dev->cache_last_use > 100000000) { + /* Reset the cache usages */ + for (i = 1; i < dev->param.n_caches; i++) + dev->cache[i].last_use = 0; - if (is_write) - cache->dirty = 1; + dev->cache_last_use = 0; } + dev->cache_last_use++; + cache->last_use = dev->cache_last_use; + + if (is_write) + cache->dirty = 1; } /* Invalidate a single cache page. @@ -1611,9 +1573,10 @@ static void yaffs_use_cache(struct yaffs_dev *dev, struct yaffs_cache *cache, */ static void yaffs_invalidate_chunk_cache(struct yaffs_obj *object, int chunk_id) { + struct yaffs_cache *cache; + if (object->my_dev->param.n_caches > 0) { - struct yaffs_cache *cache = - yaffs_find_chunk_cache(object, chunk_id); + cache = yaffs_find_chunk_cache(object, chunk_id); if (cache) cache->object = NULL; @@ -1653,17 +1616,19 @@ static void yaffs_unhash_obj(struct yaffs_obj *obj) /* FreeObject frees up a Object and puts it back on the free list */ static void yaffs_free_obj(struct yaffs_obj *obj) { - struct yaffs_dev *dev = obj->my_dev; + struct yaffs_dev *dev; + if (!obj) { + BUG(); + return; + } + dev = obj->my_dev; yaffs_trace(YAFFS_TRACE_OS, "FreeObject %p inode %p", obj, obj->my_inode); - - if (!obj) - YBUG(); if (obj->parent) - YBUG(); + BUG(); if (!list_empty(&obj->siblings)) - YBUG(); + BUG(); if (obj->my_inode) { /* We're still hooked up to a cached inode. @@ -1688,15 +1653,13 @@ void yaffs_handle_defered_free(struct yaffs_obj *obj) static int yaffs_generic_obj_del(struct yaffs_obj *in) { - - /* First off, invalidate the file's data in the cache, without flushing. */ + /* Iinvalidate the file's data in the cache, without flushing. */ yaffs_invalidate_whole_cache(in); - if (in->my_dev->param.is_yaffs2 && (in->parent != in->my_dev->del_dir)) { - /* Move to the unlinked directory so we have a record that it was deleted. */ + if (in->my_dev->param.is_yaffs2 && in->parent != in->my_dev->del_dir) { + /* Move to unlinked directory so we have a deletion record */ yaffs_change_obj_name(in, in->my_dev->del_dir, _Y("deleted"), 0, 0); - } yaffs_remove_obj_from_dir(in); @@ -1710,25 +1673,26 @@ static int yaffs_generic_obj_del(struct yaffs_obj *in) static void yaffs_soft_del_file(struct yaffs_obj *obj) { - if (obj->deleted && - obj->variant_type == YAFFS_OBJECT_TYPE_FILE && !obj->soft_del) { - if (obj->n_data_chunks <= 0) { - /* Empty file with no duplicate object headers, - * just delete it immediately */ - yaffs_free_tnode(obj->my_dev, - obj->variant.file_variant.top); - obj->variant.file_variant.top = NULL; - yaffs_trace(YAFFS_TRACE_TRACING, - "yaffs: Deleting empty file %d", - obj->obj_id); - yaffs_generic_obj_del(obj); - } else { - yaffs_soft_del_worker(obj, - obj->variant.file_variant.top, - obj->variant. - file_variant.top_level, 0); - obj->soft_del = 1; - } + if (!obj->deleted || + obj->variant_type != YAFFS_OBJECT_TYPE_FILE || + obj->soft_del) + return; + + if (obj->n_data_chunks <= 0) { + /* Empty file with no duplicate object headers, + * just delete it immediately */ + yaffs_free_tnode(obj->my_dev, obj->variant.file_variant.top); + obj->variant.file_variant.top = NULL; + yaffs_trace(YAFFS_TRACE_TRACING, + "yaffs: Deleting empty file %d", + obj->obj_id); + yaffs_generic_obj_del(obj); + } else { + yaffs_soft_del_worker(obj, + obj->variant.file_variant.top, + obj->variant. + file_variant.top_level, 0); + obj->soft_del = 1; } } @@ -1754,44 +1718,40 @@ static struct yaffs_tnode *yaffs_prune_worker(struct yaffs_dev *dev, int i; int has_data; - if (tn) { - has_data = 0; - - if (level > 0) { - for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) { - if (tn->internal[i]) { - tn->internal[i] = - yaffs_prune_worker(dev, - tn->internal[i], - level - 1, - (i == - 0) ? del0 : 1); - } - - if (tn->internal[i]) - has_data++; + if (!tn) + return tn; + + has_data = 0; + + if (level > 0) { + for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) { + if (tn->internal[i]) { + tn->internal[i] = + yaffs_prune_worker(dev, + tn->internal[i], + level - 1, + (i == 0) ? del0 : 1); } - } else { - int tnode_size_u32 = dev->tnode_size / sizeof(u32); - u32 *map = (u32 *) tn; - for (i = 0; !has_data && i < tnode_size_u32; i++) { - if (map[i]) - has_data++; - } + if (tn->internal[i]) + has_data++; } + } else { + int tnode_size_u32 = dev->tnode_size / sizeof(u32); + u32 *map = (u32 *) tn; - if (has_data == 0 && del0) { - /* Free and return NULL */ - - yaffs_free_tnode(dev, tn); - tn = NULL; + for (i = 0; !has_data && i < tnode_size_u32; i++) { + if (map[i]) + has_data++; } - } + if (has_data == 0 && del0) { + /* Free and return NULL */ + yaffs_free_tnode(dev, tn); + tn = NULL; + } return tn; - } static int yaffs_prune_tree(struct yaffs_dev *dev, @@ -1802,34 +1762,34 @@ static int yaffs_prune_tree(struct yaffs_dev *dev, int done = 0; struct yaffs_tnode *tn; - if (file_struct->top_level > 0) { - file_struct->top = - yaffs_prune_worker(dev, file_struct->top, - file_struct->top_level, 0); + if (file_struct->top_level < 1) + return YAFFS_OK; - /* Now we have a tree with all the non-zero branches NULL but the height - * is the same as it was. - * Let's see if we can trim internal tnodes to shorten the tree. - * We can do this if only the 0th element in the tnode is in use - * (ie all the non-zero are NULL) - */ + file_struct->top = + yaffs_prune_worker(dev, file_struct->top, file_struct->top_level, 0); - while (file_struct->top_level && !done) { - tn = file_struct->top; + /* Now we have a tree with all the non-zero branches NULL but + * the height is the same as it was. + * Let's see if we can trim internal tnodes to shorten the tree. + * We can do this if only the 0th element in the tnode is in use + * (ie all the non-zero are NULL) + */ - has_data = 0; - for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) { - if (tn->internal[i]) - has_data++; - } + while (file_struct->top_level && !done) { + tn = file_struct->top; - if (!has_data) { - file_struct->top = tn->internal[0]; - file_struct->top_level--; - yaffs_free_tnode(dev, tn); - } else { - done = 1; - } + has_data = 0; + for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) { + if (tn->internal[i]) + has_data++; + } + + if (!has_data) { + file_struct->top = tn->internal[0]; + file_struct->top_level--; + yaffs_free_tnode(dev, tn); + } else { + done = 1; } } @@ -1838,43 +1798,44 @@ static int yaffs_prune_tree(struct yaffs_dev *dev, /*-------------------- End of File Structure functions.-------------------*/ -/* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */ +/* alloc_empty_obj gets us a clean Object.*/ static struct yaffs_obj *yaffs_alloc_empty_obj(struct yaffs_dev *dev) { struct yaffs_obj *obj = yaffs_alloc_raw_obj(dev); - if (obj) { - dev->n_obj++; + if (!obj) + return obj; - /* Now sweeten it up... */ + dev->n_obj++; - memset(obj, 0, sizeof(struct yaffs_obj)); - obj->being_created = 1; + /* Now sweeten it up... */ - obj->my_dev = dev; - obj->hdr_chunk = 0; - obj->variant_type = YAFFS_OBJECT_TYPE_UNKNOWN; - INIT_LIST_HEAD(&(obj->hard_links)); - INIT_LIST_HEAD(&(obj->hash_link)); - INIT_LIST_HEAD(&obj->siblings); + memset(obj, 0, sizeof(struct yaffs_obj)); + obj->being_created = 1; - /* Now make the directory sane */ - if (dev->root_dir) { - obj->parent = dev->root_dir; - list_add(&(obj->siblings), - &dev->root_dir->variant.dir_variant.children); - } + obj->my_dev = dev; + obj->hdr_chunk = 0; + obj->variant_type = YAFFS_OBJECT_TYPE_UNKNOWN; + INIT_LIST_HEAD(&(obj->hard_links)); + INIT_LIST_HEAD(&(obj->hash_link)); + INIT_LIST_HEAD(&obj->siblings); - /* Add it to the lost and found directory. - * NB Can't put root or lost-n-found in lost-n-found so - * check if lost-n-found exists first - */ - if (dev->lost_n_found) - yaffs_add_obj_to_dir(dev->lost_n_found, obj); - - obj->being_created = 0; + /* Now make the directory sane */ + if (dev->root_dir) { + obj->parent = dev->root_dir; + list_add(&(obj->siblings), + &dev->root_dir->variant.dir_variant.children); } + /* Add it to the lost and found directory. + * NB Can't put root or lost-n-found in lost-n-found so + * check if lost-n-found exists first + */ + if (dev->lost_n_found) + yaffs_add_obj_to_dir(dev->lost_n_found, obj); + + obj->being_created = 0; + dev->checkpoint_blocks_required = 0; /* force recalculation */ return obj; @@ -1897,7 +1858,6 @@ static int yaffs_find_nice_bucket(struct yaffs_dev *dev) lowest = dev->obj_bucket[dev->bucket_finder].count; l = dev->bucket_finder; } - } return l; @@ -1906,17 +1866,13 @@ static int yaffs_find_nice_bucket(struct yaffs_dev *dev) static int yaffs_new_obj_id(struct yaffs_dev *dev) { int bucket = yaffs_find_nice_bucket(dev); - - /* Now find an object value that has not already been taken - * by scanning the list. - */ - int found = 0; struct list_head *i; - u32 n = (u32) bucket; - /* yaffs_check_obj_hash_sane(); */ + /* Now find an object value that has not already been taken + * by scanning the list. + */ while (!found) { found = 1; @@ -1931,7 +1887,6 @@ static int yaffs_new_obj_id(struct yaffs_dev *dev) } } } - return n; } @@ -1954,7 +1909,7 @@ struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number) /* Look if it is in the list */ in = list_entry(i, struct yaffs_obj, hash_link); if (in->obj_id == number) { - /* Don't tell the VFS about this one if it is defered free */ + /* Don't show if it is defered free */ if (in->defered_free) return NULL; return in; @@ -1986,38 +1941,35 @@ struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number, return NULL; } - if (the_obj) { - the_obj->fake = 0; - the_obj->rename_allowed = 1; - the_obj->unlink_allowed = 1; - the_obj->obj_id = number; - yaffs_hash_obj(the_obj); - the_obj->variant_type = type; - yaffs_load_current_time(the_obj, 1, 1); + the_obj->fake = 0; + the_obj->rename_allowed = 1; + the_obj->unlink_allowed = 1; + the_obj->obj_id = number; + yaffs_hash_obj(the_obj); + the_obj->variant_type = type; + yaffs_load_current_time(the_obj, 1, 1); - switch (type) { - case YAFFS_OBJECT_TYPE_FILE: - the_obj->variant.file_variant.file_size = 0; - the_obj->variant.file_variant.scanned_size = 0; - the_obj->variant.file_variant.shrink_size = ~0; /* max */ - the_obj->variant.file_variant.top_level = 0; - the_obj->variant.file_variant.top = tn; - break; - case YAFFS_OBJECT_TYPE_DIRECTORY: - INIT_LIST_HEAD(&the_obj->variant.dir_variant.children); - INIT_LIST_HEAD(&the_obj->variant.dir_variant.dirty); - break; - case YAFFS_OBJECT_TYPE_SYMLINK: - case YAFFS_OBJECT_TYPE_HARDLINK: - case YAFFS_OBJECT_TYPE_SPECIAL: - /* No action required */ - break; - case YAFFS_OBJECT_TYPE_UNKNOWN: - /* todo this should not happen */ - break; - } + switch (type) { + case YAFFS_OBJECT_TYPE_FILE: + the_obj->variant.file_variant.file_size = 0; + the_obj->variant.file_variant.scanned_size = 0; + the_obj->variant.file_variant.shrink_size = ~0; /* max */ + the_obj->variant.file_variant.top_level = 0; + the_obj->variant.file_variant.top = tn; + break; + case YAFFS_OBJECT_TYPE_DIRECTORY: + INIT_LIST_HEAD(&the_obj->variant.dir_variant.children); + INIT_LIST_HEAD(&the_obj->variant.dir_variant.dirty); + break; + case YAFFS_OBJECT_TYPE_SYMLINK: + case YAFFS_OBJECT_TYPE_HARDLINK: + case YAFFS_OBJECT_TYPE_SPECIAL: + /* No action required */ + break; + case YAFFS_OBJECT_TYPE_UNKNOWN: + /* todo this should not happen */ + break; } - return the_obj; } @@ -2027,17 +1979,18 @@ static struct yaffs_obj *yaffs_create_fake_dir(struct yaffs_dev *dev, struct yaffs_obj *obj = yaffs_new_obj(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY); - if (obj) { - obj->fake = 1; /* it is fake so it might have no NAND presence... */ - obj->rename_allowed = 0; /* ... and we're not allowed to rename it... */ - obj->unlink_allowed = 0; /* ... or unlink it */ - obj->deleted = 0; - obj->unlinked = 0; - obj->yst_mode = mode; - obj->my_dev = dev; - obj->hdr_chunk = 0; /* Not a valid chunk. */ - } + if (!obj) + return NULL; + + obj->fake = 1; /* it is fake so it might not use NAND */ + obj->rename_allowed = 0; + obj->unlink_allowed = 0; + obj->deleted = 0; + obj->unlinked = 0; + obj->yst_mode = mode; + obj->my_dev = dev; + obj->hdr_chunk = 0; /* Not a valid chunk. */ return obj; } @@ -2049,7 +2002,6 @@ static void yaffs_init_tnodes_and_objs(struct yaffs_dev *dev) dev->n_obj = 0; dev->n_tnodes = 0; - yaffs_init_raw_tnodes_and_objs(dev); for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { @@ -2074,7 +2026,7 @@ struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev, } -YCHAR *yaffs_clone_str(const YCHAR * str) +YCHAR *yaffs_clone_str(const YCHAR *str) { YCHAR *new_str = NULL; int len; @@ -2110,6 +2062,7 @@ YCHAR *yaffs_clone_str(const YCHAR * str) static void yaffs_update_parent(struct yaffs_obj *obj) { struct yaffs_dev *dev; + if (!obj) return; dev = obj->my_dev; @@ -2127,7 +2080,7 @@ static void yaffs_update_parent(struct yaffs_obj *obj) } else { yaffs_update_oh(obj, NULL, 0, 0, 0, NULL); - } + } } void yaffs_update_dirty_dirs(struct yaffs_dev *dev) @@ -2164,19 +2117,19 @@ void yaffs_update_dirty_dirs(struct yaffs_dev *dev) static struct yaffs_obj *yaffs_create_obj(enum yaffs_obj_type type, struct yaffs_obj *parent, - const YCHAR * name, + const YCHAR *name, u32 mode, u32 uid, u32 gid, struct yaffs_obj *equiv_obj, - const YCHAR * alias_str, u32 rdev) + const YCHAR *alias_str, u32 rdev) { struct yaffs_obj *in; YCHAR *str = NULL; - struct yaffs_dev *dev = parent->my_dev; - /* Check if the entry exists. If it does then fail the call since we don't want a dup. */ + /* Check if the entry exists. + * If it does then fail the call since we don't want a dup. */ if (yaffs_find_by_name(parent, name)) return NULL; @@ -2189,68 +2142,65 @@ static struct yaffs_obj *yaffs_create_obj(enum yaffs_obj_type type, in = yaffs_new_obj(dev, -1, type); if (!in) { - if (str) - kfree(str); + kfree(str); return NULL; } - if (in) { - in->hdr_chunk = 0; - in->valid = 1; - in->variant_type = type; + in->hdr_chunk = 0; + in->valid = 1; + in->variant_type = type; - in->yst_mode = mode; + in->yst_mode = mode; - yaffs_attribs_init(in, gid, uid, rdev); + yaffs_attribs_init(in, gid, uid, rdev); - in->n_data_chunks = 0; + in->n_data_chunks = 0; - yaffs_set_obj_name(in, name); - in->dirty = 1; + yaffs_set_obj_name(in, name); + in->dirty = 1; - yaffs_add_obj_to_dir(parent, in); + yaffs_add_obj_to_dir(parent, in); - in->my_dev = parent->my_dev; + in->my_dev = parent->my_dev; - switch (type) { - case YAFFS_OBJECT_TYPE_SYMLINK: - in->variant.symlink_variant.alias = str; - break; - case YAFFS_OBJECT_TYPE_HARDLINK: - in->variant.hardlink_variant.equiv_obj = equiv_obj; - in->variant.hardlink_variant.equiv_id = - equiv_obj->obj_id; - list_add(&in->hard_links, &equiv_obj->hard_links); - break; - case YAFFS_OBJECT_TYPE_FILE: - case YAFFS_OBJECT_TYPE_DIRECTORY: - case YAFFS_OBJECT_TYPE_SPECIAL: - case YAFFS_OBJECT_TYPE_UNKNOWN: - /* do nothing */ - break; - } + switch (type) { + case YAFFS_OBJECT_TYPE_SYMLINK: + in->variant.symlink_variant.alias = str; + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + in->variant.hardlink_variant.equiv_obj = equiv_obj; + in->variant.hardlink_variant.equiv_id = equiv_obj->obj_id; + list_add(&in->hard_links, &equiv_obj->hard_links); + break; + case YAFFS_OBJECT_TYPE_FILE: + case YAFFS_OBJECT_TYPE_DIRECTORY: + case YAFFS_OBJECT_TYPE_SPECIAL: + case YAFFS_OBJECT_TYPE_UNKNOWN: + /* do nothing */ + break; + } - if (yaffs_update_oh(in, name, 0, 0, 0, NULL) < 0) { - /* Could not create the object header, fail the creation */ - yaffs_del_obj(in); - in = NULL; - } + if (yaffs_update_oh(in, name, 0, 0, 0, NULL) < 0) { + /* Could not create the object header, fail */ + yaffs_del_obj(in); + in = NULL; + } + if (in) yaffs_update_parent(parent); - } return in; } struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent, - const YCHAR * name, u32 mode, u32 uid, + const YCHAR *name, u32 mode, u32 uid, u32 gid) { return yaffs_create_obj(YAFFS_OBJECT_TYPE_FILE, parent, name, mode, uid, gid, NULL, NULL, 0); } -struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR * name, +struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR *name, u32 mode, u32 uid, u32 gid) { return yaffs_create_obj(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name, @@ -2258,7 +2208,7 @@ struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR * name, } struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent, - const YCHAR * name, u32 mode, u32 uid, + const YCHAR *name, u32 mode, u32 uid, u32 gid, u32 rdev) { return yaffs_create_obj(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode, @@ -2266,8 +2216,8 @@ struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent, } struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent, - const YCHAR * name, u32 mode, u32 uid, - u32 gid, const YCHAR * alias) + const YCHAR *name, u32 mode, u32 uid, + u32 gid, const YCHAR *alias) { return yaffs_create_obj(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode, uid, gid, NULL, alias, 0); @@ -2277,22 +2227,40 @@ struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent, struct yaffs_obj *yaffs_link_obj(struct yaffs_obj *parent, const YCHAR * name, struct yaffs_obj *equiv_obj) { - /* Get the real object in case we were fed a hard link as an equivalent object */ + /* Get the real object in case we were fed a hard link obj */ equiv_obj = yaffs_get_equivalent_obj(equiv_obj); - if (yaffs_create_obj - (YAFFS_OBJECT_TYPE_HARDLINK, parent, name, 0, 0, 0, - equiv_obj, NULL, 0)) { + if (yaffs_create_obj(YAFFS_OBJECT_TYPE_HARDLINK, + parent, name, 0, 0, 0, + equiv_obj, NULL, 0)) return equiv_obj; - } else { - return NULL; - } + + return NULL; } -/*------------------------- Block Management and Page Allocation ----------------*/ +/*---------------------- Block Management and Page Allocation -------------*/ + +static void yaffs_deinit_blocks(struct yaffs_dev *dev) +{ + if (dev->block_info_alt && dev->block_info) + vfree(dev->block_info); + else + kfree(dev->block_info); + + dev->block_info_alt = 0; + + dev->block_info = NULL; + + if (dev->chunk_bits_alt && dev->chunk_bits) + vfree(dev->chunk_bits); + else + kfree(dev->chunk_bits); + dev->chunk_bits_alt = 0; + dev->chunk_bits = NULL; +} static int yaffs_init_blocks(struct yaffs_dev *dev) { @@ -2300,7 +2268,6 @@ static int yaffs_init_blocks(struct yaffs_dev *dev) dev->block_info = NULL; dev->chunk_bits = NULL; - dev->alloc_block = -1; /* force it to get a new one */ /* If the first allocation strategy fails, thry the alternate one */ @@ -2312,56 +2279,41 @@ static int yaffs_init_blocks(struct yaffs_dev *dev) dev->block_info_alt = 1; } else { dev->block_info_alt = 0; - } + } - if (dev->block_info) { - /* Set up dynamic blockinfo stuff. Round up bytes. */ - dev->chunk_bit_stride = (dev->param.chunks_per_block + 7) / 8; + if (!dev->block_info) + goto alloc_error; + + /* Set up dynamic blockinfo stuff. Round up bytes. */ + dev->chunk_bit_stride = (dev->param.chunks_per_block + 7) / 8; + dev->chunk_bits = + kmalloc(dev->chunk_bit_stride * n_blocks, GFP_NOFS); + if (!dev->chunk_bits) { dev->chunk_bits = - kmalloc(dev->chunk_bit_stride * n_blocks, GFP_NOFS); - if (!dev->chunk_bits) { - dev->chunk_bits = - vmalloc(dev->chunk_bit_stride * n_blocks); - dev->chunk_bits_alt = 1; - } else { - dev->chunk_bits_alt = 0; - } + vmalloc(dev->chunk_bit_stride * n_blocks); + dev->chunk_bits_alt = 1; + } else { + dev->chunk_bits_alt = 0; } + if (!dev->chunk_bits) + goto alloc_error; - if (dev->block_info && dev->chunk_bits) { - memset(dev->block_info, 0, - n_blocks * sizeof(struct yaffs_block_info)); - memset(dev->chunk_bits, 0, dev->chunk_bit_stride * n_blocks); - return YAFFS_OK; - } + memset(dev->block_info, 0, n_blocks * sizeof(struct yaffs_block_info)); + memset(dev->chunk_bits, 0, dev->chunk_bit_stride * n_blocks); + return YAFFS_OK; + +alloc_error: + yaffs_deinit_blocks(dev); return YAFFS_FAIL; } -static void yaffs_deinit_blocks(struct yaffs_dev *dev) -{ - if (dev->block_info_alt && dev->block_info) - vfree(dev->block_info); - else if (dev->block_info) - kfree(dev->block_info); - - dev->block_info_alt = 0; - - dev->block_info = NULL; - - if (dev->chunk_bits_alt && dev->chunk_bits) - vfree(dev->chunk_bits); - else if (dev->chunk_bits) - kfree(dev->chunk_bits); - dev->chunk_bits_alt = 0; - dev->chunk_bits = NULL; -} void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no) { struct yaffs_block_info *bi = yaffs_get_block_info(dev, block_no); - int erased_ok = 0; + int i; /* If the block is still healthy erase it and mark as clean. * If the block has had a data failure, then retire it. @@ -2376,11 +2328,12 @@ void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no) bi->block_state = YAFFS_BLOCK_STATE_DIRTY; - /* If this is the block being garbage collected then stop gc'ing this block */ + /* If this is the block being garbage collected then stop gc'ing */ if (block_no == dev->gc_block) dev->gc_block = 0; - /* If this block is currently the best candidate for gc then drop as a candidate */ + /* If this block is currently the best candidate for gc + * then drop as a candidate */ if (block_no == dev->gc_dirtiest) { dev->gc_dirtiest = 0; dev->gc_pages_in_use = 0; @@ -2396,13 +2349,13 @@ void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no) } } + /* Verify erasure if needed */ if (erased_ok && - ((yaffs_trace_mask & YAFFS_TRACE_ERASE) - || !yaffs_skip_verification(dev))) { - int i; + ((yaffs_trace_mask & YAFFS_TRACE_ERASE) || + !yaffs_skip_verification(dev))) { for (i = 0; i < dev->param.chunks_per_block; i++) { - if (!yaffs_check_chunk_erased - (dev, block_no * dev->param.chunks_per_block + i)) { + if (!yaffs_check_chunk_erased(dev, + block_no * dev->param.chunks_per_block + i)) { yaffs_trace(YAFFS_TRACE_ERROR, ">>Block %d erasure supposedly OK, but chunk %d not erased", block_no, i); @@ -2410,51 +2363,185 @@ void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no) } } - if (erased_ok) { - /* Clean it up... */ - bi->block_state = YAFFS_BLOCK_STATE_EMPTY; - bi->seq_number = 0; - dev->n_erased_blocks++; - bi->pages_in_use = 0; - bi->soft_del_pages = 0; - bi->has_shrink_hdr = 0; - bi->skip_erased_check = 1; /* Clean, so no need to check */ - bi->gc_prioritise = 0; - yaffs_clear_chunk_bits(dev, block_no); - - yaffs_trace(YAFFS_TRACE_ERASE, - "Erased block %d", block_no); - } else { + if (!erased_ok) { /* We lost a block of free space */ dev->n_free_chunks -= dev->param.chunks_per_block; yaffs_retire_block(dev, block_no); yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, "**>> Block %d retired", block_no); + return; } + + /* Clean it up... */ + bi->block_state = YAFFS_BLOCK_STATE_EMPTY; + bi->seq_number = 0; + dev->n_erased_blocks++; + bi->pages_in_use = 0; + bi->soft_del_pages = 0; + bi->has_shrink_hdr = 0; + bi->skip_erased_check = 1; /* Clean, so no need to check */ + bi->gc_prioritise = 0; + bi->has_summary=0; + + yaffs_clear_chunk_bits(dev, block_no); + + yaffs_trace(YAFFS_TRACE_ERASE, "Erased block %d", block_no); } +static inline int yaffs_gc_process_chunk(struct yaffs_dev *dev, + struct yaffs_block_info *bi, + int old_chunk, u8 *buffer) +{ + int new_chunk; + int mark_flash = 1; + struct yaffs_ext_tags tags; + struct yaffs_obj *object; + int matching_chunk; + int ret_val = YAFFS_OK; + + memset(&tags, 0, sizeof(tags)); + yaffs_rd_chunk_tags_nand(dev, old_chunk, + buffer, &tags); + object = yaffs_find_by_number(dev, tags.obj_id); + + yaffs_trace(YAFFS_TRACE_GC_DETAIL, + "Collecting chunk in block %d, %d %d %d ", + dev->gc_chunk, tags.obj_id, + tags.chunk_id, tags.n_bytes); + + if (object && !yaffs_skip_verification(dev)) { + if (tags.chunk_id == 0) + matching_chunk = + object->hdr_chunk; + else if (object->soft_del) + /* Defeat the test */ + matching_chunk = old_chunk; + else + matching_chunk = + yaffs_find_chunk_in_file + (object, tags.chunk_id, + NULL); + + if (old_chunk != matching_chunk) + yaffs_trace(YAFFS_TRACE_ERROR, + "gc: page in gc mismatch: %d %d %d %d", + old_chunk, + matching_chunk, + tags.obj_id, + tags.chunk_id); + } + + if (!object) { + yaffs_trace(YAFFS_TRACE_ERROR, + "page %d in gc has no object: %d %d %d ", + old_chunk, + tags.obj_id, tags.chunk_id, + tags.n_bytes); + } + + if (object && + object->deleted && + object->soft_del && tags.chunk_id != 0) { + /* Data chunk in a soft deleted file, + * throw it away. + * It's a soft deleted data chunk, + * No need to copy this, just forget + * about it and fix up the object. + */ + + /* Free chunks already includes + * softdeleted chunks, how ever this + * chunk is going to soon be really + * deleted which will increment free + * chunks. We have to decrement free + * chunks so this works out properly. + */ + dev->n_free_chunks--; + bi->soft_del_pages--; + + object->n_data_chunks--; + if (object->n_data_chunks <= 0) { + /* remeber to clean up obj */ + dev->gc_cleanup_list[dev->n_clean_ups] = tags.obj_id; + dev->n_clean_ups++; + } + mark_flash = 0; + } else if (object) { + /* It's either a data chunk in a live + * file or an ObjectHeader, so we're + * interested in it. + * NB Need to keep the ObjectHeaders of + * deleted files until the whole file + * has been deleted off + */ + tags.serial_number++; + dev->n_gc_copies++; + + if (tags.chunk_id == 0) { + /* It is an object Id, + * We need to nuke the + * shrinkheader flags since its + * work is done. + * Also need to clean up + * shadowing. + */ + struct yaffs_obj_hdr *oh; + oh = (struct yaffs_obj_hdr *) buffer; + + oh->is_shrink = 0; + tags.extra_is_shrink = 0; + oh->shadows_obj = 0; + oh->inband_shadowed_obj_id = 0; + tags.extra_shadows = 0; + + /* Update file size */ + if (object->variant_type == YAFFS_OBJECT_TYPE_FILE) { + oh->file_size = + object->variant.file_variant.file_size; + tags.extra_length = oh->file_size; + } + + yaffs_verify_oh(object, oh, &tags, 1); + new_chunk = + yaffs_write_new_chunk(dev, (u8 *) oh, &tags, 1); + } else { + new_chunk = + yaffs_write_new_chunk(dev, buffer, &tags, 1); + } + if (new_chunk < 0) { + ret_val = YAFFS_FAIL; + } else { + + /* Now fix up the Tnodes etc. */ + + if (tags.chunk_id == 0) { + /* It's a header */ + object->hdr_chunk = new_chunk; + object->serial = tags.serial_number; + } else { + /* It's a data chunk */ + yaffs_put_chunk_in_file(object, tags.chunk_id, + new_chunk, 0); + } + } + } + if (ret_val == YAFFS_OK) + yaffs_chunk_del(dev, old_chunk, mark_flash, __LINE__); + return ret_val; +} static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block) { int old_chunk; - int new_chunk; - int mark_flash; int ret_val = YAFFS_OK; int i; int is_checkpt_block; - int matching_chunk; int max_copies; - int chunks_before = yaffs_get_erased_chunks(dev); int chunks_after; - - struct yaffs_ext_tags tags; - struct yaffs_block_info *bi = yaffs_get_block_info(dev, block); - struct yaffs_obj *object; - is_checkpt_block = (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT); yaffs_trace(YAFFS_TRACE_TRACING, @@ -2471,200 +2558,36 @@ static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block) dev->gc_disable = 1; + yaffs_summary_gc(dev, block); + if (is_checkpt_block || !yaffs_still_some_chunks(dev, block)) { yaffs_trace(YAFFS_TRACE_TRACING, "Collecting block %d that has no chunks in use", - block); + block); yaffs_block_became_dirty(dev, block); } else { - u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__); + u8 *buffer = yaffs_get_temp_buffer(dev); yaffs_verify_blk(dev, bi, block); max_copies = (whole_block) ? dev->param.chunks_per_block : 5; old_chunk = block * dev->param.chunks_per_block + dev->gc_chunk; - for ( /* init already done */ ; + for (/* init already done */ ; ret_val == YAFFS_OK && dev->gc_chunk < dev->param.chunks_per_block && (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) && - max_copies > 0; dev->gc_chunk++, old_chunk++) { + max_copies > 0; + dev->gc_chunk++, old_chunk++) { if (yaffs_check_chunk_bit(dev, block, dev->gc_chunk)) { - - /* This page is in use and might need to be copied off */ - + /* Page is in use and might need to be copied */ max_copies--; - - mark_flash = 1; - - yaffs_init_tags(&tags); - - yaffs_rd_chunk_tags_nand(dev, old_chunk, - buffer, &tags); - - object = yaffs_find_by_number(dev, tags.obj_id); - - yaffs_trace(YAFFS_TRACE_GC_DETAIL, - "Collecting chunk in block %d, %d %d %d ", - dev->gc_chunk, tags.obj_id, - tags.chunk_id, tags.n_bytes); - - if (object && !yaffs_skip_verification(dev)) { - if (tags.chunk_id == 0) - matching_chunk = - object->hdr_chunk; - else if (object->soft_del) - matching_chunk = old_chunk; /* Defeat the test */ - else - matching_chunk = - yaffs_find_chunk_in_file - (object, tags.chunk_id, - NULL); - - if (old_chunk != matching_chunk) - yaffs_trace(YAFFS_TRACE_ERROR, - "gc: page in gc mismatch: %d %d %d %d", - old_chunk, - matching_chunk, - tags.obj_id, - tags.chunk_id); - - } - - if (!object) { - yaffs_trace(YAFFS_TRACE_ERROR, - "page %d in gc has no object: %d %d %d ", - old_chunk, - tags.obj_id, tags.chunk_id, - tags.n_bytes); - } - - if (object && - object->deleted && - object->soft_del && tags.chunk_id != 0) { - /* Data chunk in a soft deleted file, throw it away - * It's a soft deleted data chunk, - * No need to copy this, just forget about it and - * fix up the object. - */ - - /* Free chunks already includes softdeleted chunks. - * How ever this chunk is going to soon be really deleted - * which will increment free chunks. - * We have to decrement free chunks so this works out properly. - */ - dev->n_free_chunks--; - bi->soft_del_pages--; - - object->n_data_chunks--; - - if (object->n_data_chunks <= 0) { - /* remeber to clean up the object */ - dev->gc_cleanup_list[dev-> - n_clean_ups] - = tags.obj_id; - dev->n_clean_ups++; - } - mark_flash = 0; - } else if (0) { - /* Todo object && object->deleted && object->n_data_chunks == 0 */ - /* Deleted object header with no data chunks. - * Can be discarded and the file deleted. - */ - object->hdr_chunk = 0; - yaffs_free_tnode(object->my_dev, - object-> - variant.file_variant. - top); - object->variant.file_variant.top = NULL; - yaffs_generic_obj_del(object); - - } else if (object) { - /* It's either a data chunk in a live file or - * an ObjectHeader, so we're interested in it. - * NB Need to keep the ObjectHeaders of deleted files - * until the whole file has been deleted off - */ - tags.serial_number++; - - dev->n_gc_copies++; - - if (tags.chunk_id == 0) { - /* It is an object Id, - * We need to nuke the shrinkheader flags first - * Also need to clean up shadowing. - * We no longer want the shrink_header flag since its work is done - * and if it is left in place it will mess up scanning. - */ - - struct yaffs_obj_hdr *oh; - oh = (struct yaffs_obj_hdr *) - buffer; - - oh->is_shrink = 0; - tags.extra_is_shrink = 0; - - oh->shadows_obj = 0; - oh->inband_shadowed_obj_id = 0; - tags.extra_shadows = 0; - - /* Update file size */ - if (object->variant_type == - YAFFS_OBJECT_TYPE_FILE) { - oh->file_size = - object->variant. - file_variant. - file_size; - tags.extra_length = - oh->file_size; - } - - yaffs_verify_oh(object, oh, - &tags, 1); - new_chunk = - yaffs_write_new_chunk(dev, - (u8 *) - oh, - &tags, - 1); - } else { - new_chunk = - yaffs_write_new_chunk(dev, - buffer, - &tags, - 1); - } - - if (new_chunk < 0) { - ret_val = YAFFS_FAIL; - } else { - - /* Ok, now fix up the Tnodes etc. */ - - if (tags.chunk_id == 0) { - /* It's a header */ - object->hdr_chunk = - new_chunk; - object->serial = - tags.serial_number; - } else { - /* It's a data chunk */ - int ok; - ok = yaffs_put_chunk_in_file(object, tags.chunk_id, new_chunk, 0); - } - } - } - - if (ret_val == YAFFS_OK) - yaffs_chunk_del(dev, old_chunk, - mark_flash, __LINE__); - + ret_val = yaffs_gc_process_chunk(dev, bi, + old_chunk, buffer); } } - - yaffs_release_temp_buffer(dev, buffer, __LINE__); - + yaffs_release_temp_buffer(dev, buffer); } yaffs_verify_collected_blk(dev, bi, block); @@ -2680,12 +2603,11 @@ static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block) /* Do any required cleanups */ for (i = 0; i < dev->n_clean_ups; i++) { /* Time to delete the file too */ - object = + struct yaffs_obj *object = yaffs_find_by_number(dev, dev->gc_cleanup_list[i]); if (object) { yaffs_free_tnode(dev, - object->variant. - file_variant.top); + object->variant.file_variant.top); object->variant.file_variant.top = NULL; yaffs_trace(YAFFS_TRACE_GC, "yaffs: About to finally delete object %d", @@ -2695,7 +2617,6 @@ static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block) } } - chunks_after = yaffs_get_erased_chunks(dev); if (chunks_before >= chunks_after) yaffs_trace(YAFFS_TRACE_GC, @@ -2712,7 +2633,7 @@ static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block) } /* - * FindBlockForgarbageCollection is used to select the dirtiest block (or close enough) + * find_gc_block() selects the dirtiest block (or close enough) * for garbage collection. */ @@ -2747,8 +2668,8 @@ static unsigned yaffs_find_gc_block(struct yaffs_dev *dev, /* * If there is a prioritised block and none was selected then - * this happened because there is at least one old dirty block gumming - * up the works. Let's gc the oldest dirty block. + * this happened because there is at least one old dirty block + * gumming up the works. Let's gc the oldest dirty block. */ if (prioritised_exist && @@ -2759,9 +2680,9 @@ static unsigned yaffs_find_gc_block(struct yaffs_dev *dev, dev->has_pending_prioritised_gc = 0; } - /* If we're doing aggressive GC then we are happy to take a less-dirty block, and - * search harder. - * else (we're doing a leasurely gc), then we only bother to do this if the + /* If we're doing aggressive GC then we are happy to take a less-dirty + * block, and search harder. + * else (leasurely gc), then we only bother to do this if the * block has only a few pages in use. */ @@ -2797,7 +2718,8 @@ static unsigned yaffs_find_gc_block(struct yaffs_dev *dev, for (i = 0; i < iterations && (dev->gc_dirtiest < 1 || - dev->gc_pages_in_use > YAFFS_GC_GOOD_ENOUGH); i++) { + dev->gc_pages_in_use > YAFFS_GC_GOOD_ENOUGH); + i++) { dev->gc_block_finder++; if (dev->gc_block_finder < dev->internal_start_block || dev->gc_block_finder > dev->internal_end_block) @@ -2810,9 +2732,9 @@ static unsigned yaffs_find_gc_block(struct yaffs_dev *dev, if (bi->block_state == YAFFS_BLOCK_STATE_FULL && pages_used < dev->param.chunks_per_block && - (dev->gc_dirtiest < 1 - || pages_used < dev->gc_pages_in_use) - && yaffs_block_ok_for_gc(dev, bi)) { + (dev->gc_dirtiest < 1 || + pages_used < dev->gc_pages_in_use) && + yaffs_block_ok_for_gc(dev, bi)) { dev->gc_dirtiest = dev->gc_block_finder; dev->gc_pages_in_use = pages_used; } @@ -2823,7 +2745,7 @@ static unsigned yaffs_find_gc_block(struct yaffs_dev *dev, } /* - * If nothing has been selected for a while, try selecting the oldest dirty + * If nothing has been selected for a while, try the oldest dirty * because that's gumming up the works. */ @@ -2839,7 +2761,7 @@ static unsigned yaffs_find_gc_block(struct yaffs_dev *dev, bi->pages_in_use - bi->soft_del_pages; } else { dev->gc_not_done = 0; - } + } } if (selected) { @@ -2874,7 +2796,7 @@ static unsigned yaffs_find_gc_block(struct yaffs_dev *dev, * If we're very low on erased blocks then we do aggressive garbage collection * otherwise we do "leasurely" garbage collection. * Aggressive gc looks further (whole array) and will accept less dirty blocks. - * Passive gc only inspects smaller areas and will only accept more dirty blocks. + * Passive gc only inspects smaller areas and only accepts more dirty blocks. * * The idea is to help clear out space in a more spread-out manner. * Dunno if it really does anything useful. @@ -2891,13 +2813,12 @@ static int yaffs_check_gc(struct yaffs_dev *dev, int background) if (dev->param.gc_control && (dev->param.gc_control(dev) & 1) == 0) return YAFFS_OK; - if (dev->gc_disable) { + if (dev->gc_disable) /* Bail out so we don't get recursive gc */ return YAFFS_OK; - } /* This loop should pass the first time. - * We'll only see looping here if the collection does not increase space. + * Only loops here if the collection does not increase space. */ do { @@ -2931,7 +2852,8 @@ static int yaffs_check_gc(struct yaffs_dev *dev, int background) dev->gc_skip = 5; - /* If we don't already have a block being gc'd then see if we should start another */ + /* If we don't already have a block being gc'd then see if we + * should start another */ if (dev->gc_block < 1 && !aggressive) { dev->gc_block = yaffs2_find_refresh_block(dev); @@ -2957,8 +2879,8 @@ static int yaffs_check_gc(struct yaffs_dev *dev, int background) gc_ok = yaffs_gc_block(dev, dev->gc_block, aggressive); } - if (dev->n_erased_blocks < (dev->param.n_reserved_blocks) - && dev->gc_block > 0) { + if (dev->n_erased_blocks < (dev->param.n_reserved_blocks) && + dev->gc_block > 0) { yaffs_trace(YAFFS_TRACE_GC, "yaffs: GC !!!no reclaim!!! n_erased_blocks %d after try %d block %d", dev->n_erased_blocks, max_tries, @@ -3035,10 +2957,8 @@ void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash, if (!dev->param.is_yaffs2 && mark_flash && bi->block_state != YAFFS_BLOCK_STATE_COLLECTING) { - yaffs_init_tags(&tags); - + memset(&tags, 0, sizeof(tags)); tags.is_deleted = 1; - yaffs_wr_chunk_tags_nand(dev, chunk_id, NULL, &tags); yaffs_handle_chunk_update(dev, chunk_id, &tags); } else { @@ -3050,27 +2970,23 @@ void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash, */ if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING || bi->block_state == YAFFS_BLOCK_STATE_FULL || - bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCANNING || + bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN || bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) { dev->n_free_chunks++; - yaffs_clear_chunk_bit(dev, block, page); - bi->pages_in_use--; if (bi->pages_in_use == 0 && !bi->has_shrink_hdr && bi->block_state != YAFFS_BLOCK_STATE_ALLOCATING && - bi->block_state != YAFFS_BLOCK_STATE_NEEDS_SCANNING) { + bi->block_state != YAFFS_BLOCK_STATE_NEEDS_SCAN) { yaffs_block_became_dirty(dev, block); } - } - } static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk, - const u8 * buffer, int n_bytes, int use_reserve) + const u8 *buffer, int n_bytes, int use_reserve) { /* Find old chunk Need to do this to get serial number * Write new one and patch into tree. @@ -3079,10 +2995,8 @@ static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk, int prev_chunk_id; struct yaffs_ext_tags prev_tags; - int new_chunk_id; struct yaffs_ext_tags new_tags; - struct yaffs_dev *dev = in->my_dev; yaffs_check_gc(dev, 0); @@ -3097,7 +3011,7 @@ static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk, return 0; /* Set up new tags */ - yaffs_init_tags(&new_tags); + memset(&new_tags, 0, sizeof(new_tags)); new_tags.chunk_id = inode_chunk; new_tags.obj_id = in->obj_id; @@ -3109,7 +3023,7 @@ static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk, yaffs_trace(YAFFS_TRACE_ERROR, "Writing %d bytes to chunk!!!!!!!!!", n_bytes); - YBUG(); + BUG(); } new_chunk_id = @@ -3130,11 +3044,10 @@ static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk, static int yaffs_do_xattrib_mod(struct yaffs_obj *obj, int set, - const YCHAR * name, const void *value, int size, + const YCHAR *name, const void *value, int size, int flags) { struct yaffs_xattr_mod xmod; - int result; xmod.set = set; @@ -3159,7 +3072,6 @@ static int yaffs_apply_xattrib_mod(struct yaffs_obj *obj, char *buffer, int x_offs = sizeof(struct yaffs_obj_hdr); struct yaffs_dev *dev = obj->my_dev; int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr); - char *x_buffer = buffer + x_offs; if (xmod->set) @@ -3171,13 +3083,12 @@ static int yaffs_apply_xattrib_mod(struct yaffs_obj *obj, char *buffer, obj->has_xattr = nval_hasvalues(x_buffer, x_size); obj->xattr_known = 1; - xmod->result = retval; return retval; } -static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR * name, +static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR *name, void *value, int size) { char *buffer = NULL; @@ -3186,9 +3097,7 @@ static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR * name, struct yaffs_dev *dev = obj->my_dev; int x_offs = sizeof(struct yaffs_obj_hdr); int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr); - char *x_buffer; - int retval = 0; if (obj->hdr_chunk < 1) @@ -3204,7 +3113,7 @@ static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR * name, return 0; } - buffer = (char *)yaffs_get_temp_buffer(dev, __LINE__); + buffer = (char *)yaffs_get_temp_buffer(dev); if (!buffer) return -ENOMEM; @@ -3226,7 +3135,7 @@ static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR * name, else retval = nval_list(x_buffer, x_size, value, size); } - yaffs_release_temp_buffer(dev, (u8 *) buffer, __LINE__); + yaffs_release_temp_buffer(dev, (u8 *) buffer); return retval; } @@ -3254,44 +3163,38 @@ int yaffs_list_xattrib(struct yaffs_obj *obj, char *buffer, int size) static void yaffs_check_obj_details_loaded(struct yaffs_obj *in) { - u8 *chunk_data; + u8 *buf; struct yaffs_obj_hdr *oh; struct yaffs_dev *dev; struct yaffs_ext_tags tags; int result; int alloc_failed = 0; - if (!in) + if (!in || !in->lazy_loaded || in->hdr_chunk < 1) return; dev = in->my_dev; + in->lazy_loaded = 0; + buf = yaffs_get_temp_buffer(dev); - if (in->lazy_loaded && in->hdr_chunk > 0) { - in->lazy_loaded = 0; - chunk_data = yaffs_get_temp_buffer(dev, __LINE__); - - result = - yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, chunk_data, - &tags); - oh = (struct yaffs_obj_hdr *)chunk_data; + result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, buf, &tags); + oh = (struct yaffs_obj_hdr *)buf; - in->yst_mode = oh->yst_mode; - yaffs_load_attribs(in, oh); - yaffs_set_obj_name_from_oh(in, oh); + in->yst_mode = oh->yst_mode; + yaffs_load_attribs(in, oh); + yaffs_set_obj_name_from_oh(in, oh); - if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) { - in->variant.symlink_variant.alias = - yaffs_clone_str(oh->alias); - if (!in->variant.symlink_variant.alias) - alloc_failed = 1; /* Not returned to caller */ - } - - yaffs_release_temp_buffer(dev, chunk_data, __LINE__); + if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) { + in->variant.symlink_variant.alias = + yaffs_clone_str(oh->alias); + if (!in->variant.symlink_variant.alias) + alloc_failed = 1; /* Not returned */ } + yaffs_release_temp_buffer(dev, buf); } -static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR * name, - const YCHAR * oh_name, int buff_size) +static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name, + const YCHAR *oh_name, int buff_size) { #ifdef CONFIG_YAFFS_AUTO_UNICODE if (dev->param.auto_unicode) { @@ -3308,17 +3211,17 @@ static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR * name, } } else { strncpy(name, oh_name + 1, buff_size - 1); - } + } } else { #else - { + { #endif strncpy(name, oh_name, buff_size - 1); - } + } } -static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR * oh_name, - const YCHAR * name) +static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name, + const YCHAR *name) { #ifdef CONFIG_YAFFS_AUTO_UNICODE @@ -3338,7 +3241,7 @@ static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR * oh_name, } if (is_ascii) { - /* It is an ASCII name, so do a unicode to ascii conversion */ + /* It is an ASCII name, so convert unicode to ascii */ char *ascii_oh_name = (char *)oh_name; int n = YAFFS_MAX_NAME_LENGTH - 1; while (n > 0 && *name) { @@ -3348,180 +3251,163 @@ static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR * oh_name, n--; } } else { - /* It is a unicode name, so save starting at the second YCHAR */ + /* Unicode name, so save starting at the second YCHAR */ *oh_name = 0; - strncpy(oh_name + 1, name, - YAFFS_MAX_NAME_LENGTH - 2); + strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2); } } else { #else - { + { #endif strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1); - } - + } } /* UpdateObjectHeader updates the header on NAND for an object. * If name is not NULL, then that new name is used. */ -int yaffs_update_oh(struct yaffs_obj *in, const YCHAR * name, int force, +int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force, int is_shrink, int shadows, struct yaffs_xattr_mod *xmod) { struct yaffs_block_info *bi; - struct yaffs_dev *dev = in->my_dev; - int prev_chunk_id; int ret_val = 0; int result = 0; - int new_chunk_id; struct yaffs_ext_tags new_tags; struct yaffs_ext_tags old_tags; const YCHAR *alias = NULL; - u8 *buffer = NULL; YCHAR old_name[YAFFS_MAX_NAME_LENGTH + 1]; - struct yaffs_obj_hdr *oh = NULL; strcpy(old_name, _Y("silly old name")); - if (!in->fake || in == dev->root_dir || - force || xmod) { - - yaffs_check_gc(dev, 0); - yaffs_check_obj_details_loaded(in); - - buffer = yaffs_get_temp_buffer(in->my_dev, __LINE__); - oh = (struct yaffs_obj_hdr *)buffer; - - prev_chunk_id = in->hdr_chunk; - - if (prev_chunk_id > 0) { - result = yaffs_rd_chunk_tags_nand(dev, prev_chunk_id, - buffer, &old_tags); - - yaffs_verify_oh(in, oh, &old_tags, 0); - - memcpy(old_name, oh->name, sizeof(oh->name)); - memset(buffer, 0xFF, sizeof(struct yaffs_obj_hdr)); - } else { - memset(buffer, 0xFF, dev->data_bytes_per_chunk); - } - - oh->type = in->variant_type; - oh->yst_mode = in->yst_mode; - oh->shadows_obj = oh->inband_shadowed_obj_id = shadows; + if (in->fake && in != dev->root_dir && !force && !xmod) + return ret_val; - yaffs_load_attribs_oh(oh, in); + yaffs_check_gc(dev, 0); + yaffs_check_obj_details_loaded(in); - if (in->parent) - oh->parent_obj_id = in->parent->obj_id; - else - oh->parent_obj_id = 0; + buffer = yaffs_get_temp_buffer(in->my_dev); + oh = (struct yaffs_obj_hdr *)buffer; - if (name && *name) { - memset(oh->name, 0, sizeof(oh->name)); - yaffs_load_oh_from_name(dev, oh->name, name); - } else if (prev_chunk_id > 0) { - memcpy(oh->name, old_name, sizeof(oh->name)); - } else { - memset(oh->name, 0, sizeof(oh->name)); - } + prev_chunk_id = in->hdr_chunk; - oh->is_shrink = is_shrink; + if (prev_chunk_id > 0) { + result = yaffs_rd_chunk_tags_nand(dev, prev_chunk_id, + buffer, &old_tags); - switch (in->variant_type) { - case YAFFS_OBJECT_TYPE_UNKNOWN: - /* Should not happen */ - break; - case YAFFS_OBJECT_TYPE_FILE: - oh->file_size = - (oh->parent_obj_id == YAFFS_OBJECTID_DELETED - || oh->parent_obj_id == - YAFFS_OBJECTID_UNLINKED) ? 0 : in-> - variant.file_variant.file_size; - break; - case YAFFS_OBJECT_TYPE_HARDLINK: - oh->equiv_id = in->variant.hardlink_variant.equiv_id; - break; - case YAFFS_OBJECT_TYPE_SPECIAL: - /* Do nothing */ - break; - case YAFFS_OBJECT_TYPE_DIRECTORY: - /* Do nothing */ - break; - case YAFFS_OBJECT_TYPE_SYMLINK: - alias = in->variant.symlink_variant.alias; - if (!alias) - alias = _Y("no alias"); - strncpy(oh->alias, alias, YAFFS_MAX_ALIAS_LENGTH); - oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0; - break; - } + yaffs_verify_oh(in, oh, &old_tags, 0); + memcpy(old_name, oh->name, sizeof(oh->name)); + memset(buffer, 0xff, sizeof(struct yaffs_obj_hdr)); + } else { + memset(buffer, 0xff, dev->data_bytes_per_chunk); + } - /* process any xattrib modifications */ - if (xmod) - yaffs_apply_xattrib_mod(in, (char *)buffer, xmod); + oh->type = in->variant_type; + oh->yst_mode = in->yst_mode; + oh->shadows_obj = oh->inband_shadowed_obj_id = shadows; - /* Tags */ - yaffs_init_tags(&new_tags); - in->serial++; - new_tags.chunk_id = 0; - new_tags.obj_id = in->obj_id; - new_tags.serial_number = in->serial; + yaffs_load_attribs_oh(oh, in); - /* Add extra info for file header */ + if (in->parent) + oh->parent_obj_id = in->parent->obj_id; + else + oh->parent_obj_id = 0; - new_tags.extra_available = 1; - new_tags.extra_parent_id = oh->parent_obj_id; - new_tags.extra_length = oh->file_size; - new_tags.extra_is_shrink = oh->is_shrink; - new_tags.extra_equiv_id = oh->equiv_id; - new_tags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0; - new_tags.extra_obj_type = in->variant_type; + if (name && *name) { + memset(oh->name, 0, sizeof(oh->name)); + yaffs_load_oh_from_name(dev, oh->name, name); + } else if (prev_chunk_id > 0) { + memcpy(oh->name, old_name, sizeof(oh->name)); + } else { + memset(oh->name, 0, sizeof(oh->name)); + } - yaffs_verify_oh(in, oh, &new_tags, 1); + oh->is_shrink = is_shrink; - /* Create new chunk in NAND */ - new_chunk_id = - yaffs_write_new_chunk(dev, buffer, &new_tags, - (prev_chunk_id > 0) ? 1 : 0); + switch (in->variant_type) { + case YAFFS_OBJECT_TYPE_UNKNOWN: + /* Should not happen */ + break; + case YAFFS_OBJECT_TYPE_FILE: + oh->file_size = + (oh->parent_obj_id == YAFFS_OBJECTID_DELETED || + oh->parent_obj_id == YAFFS_OBJECTID_UNLINKED) ? + 0 : in->variant.file_variant.file_size; + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + oh->equiv_id = in->variant.hardlink_variant.equiv_id; + break; + case YAFFS_OBJECT_TYPE_SPECIAL: + /* Do nothing */ + break; + case YAFFS_OBJECT_TYPE_DIRECTORY: + /* Do nothing */ + break; + case YAFFS_OBJECT_TYPE_SYMLINK: + alias = in->variant.symlink_variant.alias; + if (!alias) + alias = _Y("no alias"); + strncpy(oh->alias, alias, YAFFS_MAX_ALIAS_LENGTH); + oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0; + break; + } - if (new_chunk_id >= 0) { + /* process any xattrib modifications */ + if (xmod) + yaffs_apply_xattrib_mod(in, (char *)buffer, xmod); - in->hdr_chunk = new_chunk_id; + /* Tags */ + memset(&new_tags, 0, sizeof(new_tags)); + in->serial++; + new_tags.chunk_id = 0; + new_tags.obj_id = in->obj_id; + new_tags.serial_number = in->serial; + + /* Add extra info for file header */ + new_tags.extra_available = 1; + new_tags.extra_parent_id = oh->parent_obj_id; + new_tags.extra_length = oh->file_size; + new_tags.extra_is_shrink = oh->is_shrink; + new_tags.extra_equiv_id = oh->equiv_id; + new_tags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0; + new_tags.extra_obj_type = in->variant_type; + yaffs_verify_oh(in, oh, &new_tags, 1); + + /* Create new chunk in NAND */ + new_chunk_id = + yaffs_write_new_chunk(dev, buffer, &new_tags, + (prev_chunk_id > 0) ? 1 : 0); - if (prev_chunk_id > 0) { - yaffs_chunk_del(dev, prev_chunk_id, 1, - __LINE__); - } + if (buffer) + yaffs_release_temp_buffer(dev, buffer); - if (!yaffs_obj_cache_dirty(in)) - in->dirty = 0; + if (new_chunk_id < 0) + return new_chunk_id; - /* If this was a shrink, then mark the block that the chunk lives on */ - if (is_shrink) { - bi = yaffs_get_block_info(in->my_dev, - new_chunk_id / - in->my_dev->param. - chunks_per_block); - bi->has_shrink_hdr = 1; - } + in->hdr_chunk = new_chunk_id; - } + if (prev_chunk_id > 0) + yaffs_chunk_del(dev, prev_chunk_id, 1, __LINE__); - ret_val = new_chunk_id; + if (!yaffs_obj_cache_dirty(in)) + in->dirty = 0; + /* If this was a shrink, then mark the block + * that the chunk lives on */ + if (is_shrink) { + bi = yaffs_get_block_info(in->my_dev, + new_chunk_id / + in->my_dev->param.chunks_per_block); + bi->has_shrink_hdr = 1; } - if (buffer) - yaffs_release_temp_buffer(dev, buffer, __LINE__); - return ret_val; + return new_chunk_id; } /*--------------------- File read/write ------------------------ @@ -3536,21 +3422,17 @@ int yaffs_update_oh(struct yaffs_obj *in, const YCHAR * name, int force, int yaffs_file_rd(struct yaffs_obj *in, u8 * buffer, loff_t offset, int n_bytes) { - int chunk; u32 start; int n_copy; int n = n_bytes; int n_done = 0; struct yaffs_cache *cache; - struct yaffs_dev *dev; dev = in->my_dev; while (n > 0) { - /* chunk = offset / dev->data_bytes_per_chunk + 1; */ - /* start = offset % dev->data_bytes_per_chunk; */ yaffs_addr_to_chunk(dev, offset, &chunk, &start); chunk++; @@ -3564,15 +3446,16 @@ int yaffs_file_rd(struct yaffs_obj *in, u8 * buffer, loff_t offset, int n_bytes) cache = yaffs_find_chunk_cache(in, chunk); - /* If the chunk is already in the cache or it is less than a whole chunk - * or we're using inband tags then use the cache (if there is caching) - * else bypass the cache. + /* If the chunk is already in the cache or it is less than + * a whole chunk or we're using inband tags then use the cache + * (if there is caching) else bypass the cache. */ - if (cache || n_copy != dev->data_bytes_per_chunk - || dev->param.inband_tags) { + if (cache || n_copy != dev->data_bytes_per_chunk || + dev->param.inband_tags) { if (dev->param.n_caches > 0) { - /* If we can't find the data in the cache, then load it up. */ + /* If we can't find the data in the cache, + * then load it up. */ if (!cache) { cache = @@ -3597,33 +3480,26 @@ int yaffs_file_rd(struct yaffs_obj *in, u8 * buffer, loff_t offset, int n_bytes) /* Read into the local buffer then copy.. */ u8 *local_buffer = - yaffs_get_temp_buffer(dev, __LINE__); + yaffs_get_temp_buffer(dev); yaffs_rd_data_obj(in, chunk, local_buffer); memcpy(buffer, &local_buffer[start], n_copy); - yaffs_release_temp_buffer(dev, local_buffer, - __LINE__); + yaffs_release_temp_buffer(dev, local_buffer); } - } else { - - /* A full chunk. Read directly into the supplied buffer. */ + /* A full chunk. Read directly into the buffer. */ yaffs_rd_data_obj(in, chunk, buffer); - } - n -= n_copy; offset += n_copy; buffer += n_copy; n_done += n_copy; - } - return n_done; } -int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset, +int yaffs_do_file_wr(struct yaffs_obj *in, const u8 *buffer, loff_t offset, int n_bytes, int write_trhrough) { @@ -3637,7 +3513,6 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset, int chunk_written = 0; u32 n_bytes_read; u32 chunk_start; - struct yaffs_dev *dev; dev = in->my_dev; @@ -3660,9 +3535,10 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset, if ((start + n) < dev->data_bytes_per_chunk) { n_copy = n; - /* Now folks, to calculate how many bytes to write back.... - * If we're overwriting and not writing to then end of file then - * we need to write back as much as was there before. + /* Now calculate how many bytes to write back.... + * If we're overwriting and not writing to then end of + * file then we need to write back as much as was there + * before. */ chunk_start = ((chunk - 1) * dev->data_bytes_per_chunk); @@ -3681,27 +3557,30 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset, (n_bytes_read > (start + n)) ? n_bytes_read : (start + n); - if (n_writeback < 0 - || n_writeback > dev->data_bytes_per_chunk) - YBUG(); + if (n_writeback < 0 || + n_writeback > dev->data_bytes_per_chunk) + BUG(); } else { n_copy = dev->data_bytes_per_chunk - start; n_writeback = dev->data_bytes_per_chunk; } - if (n_copy != dev->data_bytes_per_chunk - || dev->param.inband_tags) { - /* An incomplete start or end chunk (or maybe both start and end chunk), - * or we're using inband tags, so we want to use the cache buffers. + if (n_copy != dev->data_bytes_per_chunk || + dev->param.inband_tags) { + /* An incomplete start or end chunk (or maybe both + * start and end chunk), or we're using inband tags, + * so we want to use the cache buffers. */ if (dev->param.n_caches > 0) { struct yaffs_cache *cache; - /* If we can't find the data in the cache, then load the cache */ + + /* If we can't find the data in the cache, then + * load the cache */ cache = yaffs_find_chunk_cache(in, chunk); - if (!cache - && yaffs_check_alloc_available(dev, 1)) { + if (!cache && + yaffs_check_alloc_available(dev, 1)) { cache = yaffs_grab_chunk_cache(dev); cache->object = in; cache->chunk_id = chunk; @@ -3713,8 +3592,9 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset, !cache->dirty && !yaffs_check_alloc_available(dev, 1)) { - /* Drop the cache if it was a read cache item and - * no space check has been made for it. + /* Drop the cache if it was a read cache + * item and no space check has been made + * for it. */ cache = NULL; } @@ -3738,20 +3618,18 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset, cache->n_bytes, 1); cache->dirty = 0; } - } else { - chunk_written = -1; /* fail the write */ + chunk_written = -1; /* fail write */ } } else { - /* An incomplete start or end chunk (or maybe both start and end chunk) - * Read into the local buffer then copy, then copy over and write back. + /* An incomplete start or end chunk (or maybe + * both start and end chunk). Read into the + * local buffer then copy over and write back. */ - u8 *local_buffer = - yaffs_get_temp_buffer(dev, __LINE__); + u8 *local_buffer = yaffs_get_temp_buffer(dev); yaffs_rd_data_obj(in, chunk, local_buffer); - memcpy(&local_buffer[start], buffer, n_copy); chunk_written = @@ -3759,19 +3637,17 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset, local_buffer, n_writeback, 0); - yaffs_release_temp_buffer(dev, local_buffer, - __LINE__); - + yaffs_release_temp_buffer(dev, local_buffer); } - } else { - /* A full chunk. Write directly from the supplied buffer. */ + /* A full chunk. Write directly from the buffer. */ chunk_written = yaffs_wr_data_obj(in, chunk, buffer, dev->data_bytes_per_chunk, 0); - /* Since we've overwritten the cached data, we better invalidate it. */ + /* Since we've overwritten the cached data, + * we better invalidate it. */ yaffs_invalidate_chunk_cache(in, chunk); } @@ -3781,7 +3657,6 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset, buffer += n_copy; n_done += n_copy; } - } /* Update file object */ @@ -3790,11 +3665,10 @@ int yaffs_do_file_wr(struct yaffs_obj *in, const u8 * buffer, loff_t offset, in->variant.file_variant.file_size = (start_write + n_done); in->dirty = 1; - return n_done; } -int yaffs_wr_file(struct yaffs_obj *in, const u8 * buffer, loff_t offset, +int yaffs_wr_file(struct yaffs_obj *in, const u8 *buffer, loff_t offset, int n_bytes, int write_trhrough) { yaffs2_handle_hole(in, offset); @@ -3808,13 +3682,12 @@ static void yaffs_prune_chunks(struct yaffs_obj *in, int new_size) struct yaffs_dev *dev = in->my_dev; int old_size = in->variant.file_variant.file_size; - + int i; + int chunk_id; int last_del = 1 + (old_size - 1) / dev->data_bytes_per_chunk; - int start_del = 1 + (new_size + dev->data_bytes_per_chunk - 1) / dev->data_bytes_per_chunk; - int i; - int chunk_id; + /* Delete backwards so that we don't end up with holes if * power is lost part-way through the operation. @@ -3826,23 +3699,23 @@ static void yaffs_prune_chunks(struct yaffs_obj *in, int new_size) */ chunk_id = yaffs_find_del_file_chunk(in, i, NULL); - if (chunk_id > 0) { - if (chunk_id < - (dev->internal_start_block * - dev->param.chunks_per_block) - || chunk_id >= - ((dev->internal_end_block + - 1) * dev->param.chunks_per_block)) { - yaffs_trace(YAFFS_TRACE_ALWAYS, - "Found daft chunk_id %d for %d", - chunk_id, i); - } else { - in->n_data_chunks--; - yaffs_chunk_del(dev, chunk_id, 1, __LINE__); - } + + if (chunk_id < 1) + continue; + + if (chunk_id < + (dev->internal_start_block * dev->param.chunks_per_block) || + chunk_id >= + ((dev->internal_end_block + 1) * + dev->param.chunks_per_block)) { + yaffs_trace(YAFFS_TRACE_ALWAYS, + "Found daft chunk_id %d for %d", + chunk_id, i); + } else { + in->n_data_chunks--; + yaffs_chunk_del(dev, chunk_id, 1, __LINE__); } } - } void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size) @@ -3857,7 +3730,7 @@ void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size) if (new_partial != 0) { int last_chunk = 1 + new_full; - u8 *local_buffer = yaffs_get_temp_buffer(dev, __LINE__); + u8 *local_buffer = yaffs_get_temp_buffer(dev); /* Rewrite the last chunk with its new size and zero pad */ yaffs_rd_data_obj(obj, last_chunk, local_buffer); @@ -3867,7 +3740,7 @@ void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size) yaffs_wr_data_obj(obj, last_chunk, local_buffer, new_partial, 1); - yaffs_release_temp_buffer(dev, local_buffer, __LINE__); + yaffs_release_temp_buffer(dev, local_buffer); } obj->variant.file_variant.file_size = new_size; @@ -3915,24 +3788,19 @@ int yaffs_resize_file(struct yaffs_obj *in, loff_t new_size) int yaffs_flush_file(struct yaffs_obj *in, int update_time, int data_sync) { - int ret_val; - if (in->dirty) { - yaffs_flush_file_cache(in); - if (data_sync) /* Only sync data */ - ret_val = YAFFS_OK; - else { - if (update_time) - yaffs_load_current_time(in, 0, 0); + if (!in->dirty) + return YAFFS_OK; - ret_val = (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >= - 0) ? YAFFS_OK : YAFFS_FAIL; - } - } else { - ret_val = YAFFS_OK; - } + yaffs_flush_file_cache(in); - return ret_val; + if (data_sync) + return YAFFS_OK; + + if (update_time) + yaffs_load_current_time(in, 0, 0); + return (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >= 0) ? + YAFFS_OK : YAFFS_FAIL; } @@ -3942,7 +3810,6 @@ int yaffs_flush_file(struct yaffs_obj *in, int update_time, int data_sync) */ static int yaffs_unlink_file_if_needed(struct yaffs_obj *in) { - int ret_val; int del_now = 0; struct yaffs_dev *dev = in->my_dev; @@ -3967,14 +3834,13 @@ static int yaffs_unlink_file_if_needed(struct yaffs_obj *in) yaffs_change_obj_name(in, in->my_dev->unlinked_dir, _Y("unlinked"), 0, 0); } - return ret_val; } int yaffs_del_file(struct yaffs_obj *in) { int ret_val = YAFFS_OK; - int deleted; /* Need to cache value on stack if in is freed */ + int deleted; /* Need to cache value on stack if in is freed */ struct yaffs_dev *dev = in->my_dev; if (dev->param.disable_soft_del || dev->param.is_yaffs2) @@ -4009,8 +3875,8 @@ int yaffs_del_file(struct yaffs_obj *in) int yaffs_is_non_empty_dir(struct yaffs_obj *obj) { return (obj && - obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) && - !(list_empty(&obj->variant.dir_variant.children)); + obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) && + !(list_empty(&obj->variant.dir_variant.children)); } static int yaffs_del_dir(struct yaffs_obj *obj) @@ -4024,8 +3890,7 @@ static int yaffs_del_dir(struct yaffs_obj *obj) static int yaffs_del_symlink(struct yaffs_obj *in) { - if (in->variant.symlink_variant.alias) - kfree(in->variant.symlink_variant.alias); + kfree(in->variant.symlink_variant.alias); in->variant.symlink_variant.alias = NULL; return yaffs_generic_obj_del(in); @@ -4033,7 +3898,7 @@ static int yaffs_del_symlink(struct yaffs_obj *in) static int yaffs_del_link(struct yaffs_obj *in) { - /* remove this hardlink from the list assocaited with the equivalent + /* remove this hardlink from the list associated with the equivalent * object */ list_del_init(&in->hard_links); @@ -4043,6 +3908,7 @@ static int yaffs_del_link(struct yaffs_obj *in) int yaffs_del_obj(struct yaffs_obj *obj) { int ret_val = -1; + switch (obj->variant_type) { case YAFFS_OBJECT_TYPE_FILE: ret_val = yaffs_del_file(obj); @@ -4069,17 +3935,15 @@ int yaffs_del_obj(struct yaffs_obj *obj) ret_val = 0; break; /* should not happen. */ } - return ret_val; } static int yaffs_unlink_worker(struct yaffs_obj *obj) { - int del_now = 0; - if(!obj) - return YAFFS_FAIL; + if (!obj) + return YAFFS_FAIL; if (!obj->my_inode) del_now = 1; @@ -4098,7 +3962,7 @@ static int yaffs_unlink_worker(struct yaffs_obj *obj) * Instead, we do the following: * - Select a hardlink. * - Unhook it from the hard links - * - Move it from its parent directory (so that the rename can work) + * - Move it from its parent directory so that the rename works. * - Rename the object to the hardlink's name. * - Delete the hardlink */ @@ -4149,21 +4013,19 @@ static int yaffs_unlink_worker(struct yaffs_obj *obj) return YAFFS_FAIL; } else { return yaffs_change_obj_name(obj, obj->my_dev->unlinked_dir, - _Y("unlinked"), 0, 0); - } + _Y("unlinked"), 0, 0); + } } static int yaffs_unlink_obj(struct yaffs_obj *obj) { - if (obj && obj->unlink_allowed) return yaffs_unlink_worker(obj); return YAFFS_FAIL; - } -int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR * name) +int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR *name) { struct yaffs_obj *obj; @@ -4174,8 +4036,8 @@ int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR * name) /* Note: * If old_name is NULL then we take old_dir as the object to be renamed. */ -int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR * old_name, - struct yaffs_obj *new_dir, const YCHAR * new_name) +int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR *old_name, + struct yaffs_obj *new_dir, const YCHAR *new_name) { struct yaffs_obj *obj = NULL; struct yaffs_obj *existing_target = NULL; @@ -4183,10 +4045,14 @@ int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR * old_name, int result; struct yaffs_dev *dev; - if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) - YBUG(); - if (!new_dir || new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) - YBUG(); + if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) { + BUG(); + return YAFFS_FAIL; + } + if (!new_dir || new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) { + BUG(); + return YAFFS_FAIL; + } dev = old_dir->my_dev; @@ -4195,8 +4061,8 @@ int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR * old_name, * While look-up is case insensitive, the name isn't. * Therefore we might want to change x.txt to X.txt */ - if (old_dir == new_dir && - old_name && new_name && + if (old_dir == new_dir && + old_name && new_name && strcmp(old_name, new_name) == 0) force = 1; #endif @@ -4206,26 +4072,24 @@ int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR * old_name, /* ENAMETOOLONG */ return YAFFS_FAIL; - if(old_name) + if (old_name) obj = yaffs_find_by_name(old_dir, old_name); else{ obj = old_dir; old_dir = obj->parent; } - if (obj && obj->rename_allowed) { - - /* Now do the handling for an existing target, if there is one */ - + /* Now handle an existing target, if there is one */ existing_target = yaffs_find_by_name(new_dir, new_name); - if (yaffs_is_non_empty_dir(existing_target)){ + if (yaffs_is_non_empty_dir(existing_target)) { return YAFFS_FAIL; /* ENOTEMPTY */ } else if (existing_target && existing_target != obj) { /* Nuke the target first, using shadowing, * but only if it isn't the same object. * - * Note we must disable gc otherwise it can mess up the shadowing. + * Note we must disable gc here otherwise it can mess + * up the shadowing. * */ dev->gc_disable = 1; @@ -4254,12 +4118,7 @@ void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id, { struct yaffs_obj *obj; - if (!backward_scanning) { - /* Handle YAFFS1 forward scanning case - * For YAFFS1 we always do the deletion - */ - - } else { + if (backward_scanning) { /* Handle YAFFS2 case (backward scanning) * If the shadowed object exists then ignore. */ @@ -4268,7 +4127,8 @@ void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id, return; } - /* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc. + /* Let's create it (if it does not exist) assuming it is a file so that + * it can do shrinking etc. * We put it in unlinked dir to be cleaned up after the scanning */ obj = @@ -4278,22 +4138,20 @@ void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id, obj->is_shadowed = 1; yaffs_add_obj_to_dir(dev->unlinked_dir, obj); obj->variant.file_variant.shrink_size = 0; - obj->valid = 1; /* So that we don't read any other info for this file */ - + obj->valid = 1; /* So that we don't read any other info. */ } -void yaffs_link_fixup(struct yaffs_dev *dev, struct yaffs_obj *hard_list) +void yaffs_link_fixup(struct yaffs_dev *dev, struct list_head *hard_list) { + struct list_head *lh; + struct list_head *save; struct yaffs_obj *hl; struct yaffs_obj *in; - while (hard_list) { - hl = hard_list; - hard_list = (struct yaffs_obj *)(hard_list->hard_links.next); - + list_for_each_safe(lh, save, hard_list) { + hl = list_entry(lh, struct yaffs_obj, hard_links); in = yaffs_find_by_number(dev, - hl->variant. - hardlink_variant.equiv_id); + hl->variant.hardlink_variant.equiv_id); if (in) { /* Add the hardlink pointers */ @@ -4305,7 +4163,6 @@ void yaffs_link_fixup(struct yaffs_dev *dev, struct yaffs_obj *hard_list) */ hl->variant.hardlink_variant.equiv_obj = NULL; INIT_LIST_HEAD(&hl->hard_links); - } } } @@ -4325,19 +4182,14 @@ static void yaffs_strip_deleted_objs(struct yaffs_dev *dev) /* Soft delete all the unlinked files */ list_for_each_safe(i, n, &dev->unlinked_dir->variant.dir_variant.children) { - if (i) { - l = list_entry(i, struct yaffs_obj, siblings); - yaffs_del_obj(l); - } + l = list_entry(i, struct yaffs_obj, siblings); + yaffs_del_obj(l); } list_for_each_safe(i, n, &dev->del_dir->variant.dir_variant.children) { - if (i) { - l = list_entry(i, struct yaffs_obj, siblings); - yaffs_del_obj(l); - } + l = list_entry(i, struct yaffs_obj, siblings); + yaffs_del_obj(l); } - } /* @@ -4348,13 +4200,14 @@ static void yaffs_strip_deleted_objs(struct yaffs_dev *dev) * - Directly or indirectly under root. * * Note: - * This code assumes that we don't ever change the current relationships between - * directories: + * This code assumes that we don't ever change the current relationships + * between directories: * root_dir->parent == unlinked_dir->parent == del_dir->parent == NULL * lost-n-found->parent == root_dir * - * This fixes the problem where directories might have inadvertently been deleted - * leaving the object "hanging" without being rooted in the directory tree. + * This fixes the problem where directories might have inadvertently been + * deleted leaving the object "hanging" without being rooted in the + * directory tree. */ static int yaffs_has_null_parent(struct yaffs_dev *dev, struct yaffs_obj *obj) @@ -4383,45 +4236,42 @@ static void yaffs_fix_hanging_objs(struct yaffs_dev *dev) for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { list_for_each_safe(lh, n, &dev->obj_bucket[i].list) { - if (lh) { - obj = - list_entry(lh, struct yaffs_obj, hash_link); - parent = obj->parent; - - if (yaffs_has_null_parent(dev, obj)) { - /* These directories are not hanging */ - hanging = 0; - } else if (!parent - || parent->variant_type != - YAFFS_OBJECT_TYPE_DIRECTORY) { - hanging = 1; - } else if (yaffs_has_null_parent(dev, parent)) { - hanging = 0; - } else { - /* - * Need to follow the parent chain to see if it is hanging. - */ - hanging = 0; - depth_limit = 100; - - while (parent != dev->root_dir && - parent->parent && - parent->parent->variant_type == - YAFFS_OBJECT_TYPE_DIRECTORY - && depth_limit > 0) { - parent = parent->parent; - depth_limit--; - } - if (parent != dev->root_dir) - hanging = 1; - } - if (hanging) { - yaffs_trace(YAFFS_TRACE_SCAN, - "Hanging object %d moved to lost and found", - obj->obj_id); - yaffs_add_obj_to_dir(dev->lost_n_found, - obj); + obj = list_entry(lh, struct yaffs_obj, hash_link); + parent = obj->parent; + + if (yaffs_has_null_parent(dev, obj)) { + /* These directories are not hanging */ + hanging = 0; + } else if (!parent || + parent->variant_type != + YAFFS_OBJECT_TYPE_DIRECTORY) { + hanging = 1; + } else if (yaffs_has_null_parent(dev, parent)) { + hanging = 0; + } else { + /* + * Need to follow the parent chain to + * see if it is hanging. + */ + hanging = 0; + depth_limit = 100; + + while (parent != dev->root_dir && + parent->parent && + parent->parent->variant_type == + YAFFS_OBJECT_TYPE_DIRECTORY && + depth_limit > 0) { + parent = parent->parent; + depth_limit--; } + if (parent != dev->root_dir) + hanging = 1; + } + if (hanging) { + yaffs_trace(YAFFS_TRACE_SCAN, + "Hanging object %d moved to lost and found", + obj->obj_id); + yaffs_add_obj_to_dir(dev->lost_n_found, obj); } } } @@ -4437,25 +4287,17 @@ static void yaffs_del_dir_contents(struct yaffs_obj *dir) struct list_head *n; if (dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) - YBUG(); + BUG(); list_for_each_safe(lh, n, &dir->variant.dir_variant.children) { - if (lh) { - obj = list_entry(lh, struct yaffs_obj, siblings); - if (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) - yaffs_del_dir_contents(obj); - - yaffs_trace(YAFFS_TRACE_SCAN, - "Deleting lost_found object %d", - obj->obj_id); - - /* Need to use UnlinkObject since Delete would not handle - * hardlinked objects correctly. - */ - yaffs_unlink_obj(obj); - } + obj = list_entry(lh, struct yaffs_obj, siblings); + if (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) + yaffs_del_dir_contents(obj); + yaffs_trace(YAFFS_TRACE_SCAN, + "Deleting lost_found object %d", + obj->obj_id); + yaffs_unlink_obj(obj); } - } static void yaffs_empty_l_n_f(struct yaffs_dev *dev) @@ -4465,13 +4307,11 @@ static void yaffs_empty_l_n_f(struct yaffs_dev *dev) struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory, - const YCHAR * name) + const YCHAR *name) { int sum; - struct list_head *i; YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1]; - struct yaffs_obj *l; if (!name) @@ -4481,14 +4321,14 @@ struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory, yaffs_trace(YAFFS_TRACE_ALWAYS, "tragedy: yaffs_find_by_name: null pointer directory" ); - YBUG(); + BUG(); return NULL; } if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) { yaffs_trace(YAFFS_TRACE_ALWAYS, "tragedy: yaffs_find_by_name: non-directory" ); - YBUG(); + BUG(); } sum = yaffs_calc_name_sum(name); @@ -4497,7 +4337,7 @@ struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory, l = list_entry(i, struct yaffs_obj, siblings); if (l->parent != directory) - YBUG(); + BUG(); yaffs_check_obj_details_loaded(l); @@ -4505,8 +4345,7 @@ struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory, if (l->obj_id == YAFFS_OBJECTID_LOSTNFOUND) { if (!strcmp(name, YAFFS_LOSTNFOUND_NAME)) return l; - } else if (l->sum == sum - || l->hdr_chunk <= 0) { + } else if (l->sum == sum || l->hdr_chunk <= 0) { /* LostnFound chunk called Objxxx * Do a real check */ @@ -4516,7 +4355,6 @@ struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory, return l; } } - return NULL; } @@ -4527,7 +4365,6 @@ struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory, struct yaffs_obj *yaffs_get_equivalent_obj(struct yaffs_obj *obj) { if (obj && obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) { - /* We want the object id of the equivalent object, not this one */ obj = obj->variant.hardlink_variant.equiv_obj; yaffs_check_obj_details_loaded(obj); } @@ -4547,13 +4384,13 @@ struct yaffs_obj *yaffs_get_equivalent_obj(struct yaffs_obj *obj) * system to share files. * * These automatic unicode are stored slightly differently... - * - If the name can fit in the ASCII character space then they are saved as + * - If the name can fit in the ASCII character space then they are saved as * ascii names as per above. * - If the name needs Unicode then the name is saved in Unicode * starting at oh->name[1]. */ -static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR * name, +static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size) { /* Create an object name if we could not find one. */ @@ -4575,23 +4412,17 @@ static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR * name, } } -int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR * name, int buffer_size) +int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size) { memset(name, 0, buffer_size * sizeof(YCHAR)); - yaffs_check_obj_details_loaded(obj); - if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND) { strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1); - } -#ifndef CONFIG_YAFFS_NO_SHORT_NAMES - else if (obj->short_name[0]) { + } else if (obj->short_name[0]) { strcpy(name, obj->short_name); - } -#endif - else if (obj->hdr_chunk > 0) { + } else if (obj->hdr_chunk > 0) { int result; - u8 *buffer = yaffs_get_temp_buffer(obj->my_dev, __LINE__); + u8 *buffer = yaffs_get_temp_buffer(obj->my_dev); struct yaffs_obj_hdr *oh = (struct yaffs_obj_hdr *)buffer; @@ -4605,7 +4436,7 @@ int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR * name, int buffer_size) yaffs_load_name_from_oh(obj->my_dev, name, oh->name, buffer_size); - yaffs_release_temp_buffer(obj->my_dev, buffer, __LINE__); + yaffs_release_temp_buffer(obj->my_dev, buffer); } yaffs_fix_null_name(obj, name, buffer_size); @@ -4678,6 +4509,8 @@ unsigned yaffs_get_obj_type(struct yaffs_obj *obj) return DT_BLK; if (S_ISSOCK(obj->yst_mode)) return DT_SOCK; + return DT_REG; + break; default: return DT_REG; break; @@ -4697,13 +4530,10 @@ YCHAR *yaffs_get_symlink_alias(struct yaffs_obj *obj) static int yaffs_check_dev_fns(const struct yaffs_dev *dev) { - /* Common functions, gotta have */ if (!dev->param.erase_fn || !dev->param.initialise_flash_fn) return 0; -#ifdef CONFIG_YAFFS_YAFFS2 - /* Can use the "with tags" style interface for yaffs1 or yaffs2 */ if (dev->param.write_chunk_tags_fn && dev->param.read_chunk_tags_fn && @@ -4711,7 +4541,6 @@ static int yaffs_check_dev_fns(const struct yaffs_dev *dev) !dev->param.read_chunk_fn && dev->param.bad_block_fn && dev->param.query_block_fn) return 1; -#endif /* Can use the "spare" style interface for yaffs1 */ if (!dev->param.is_yaffs2 && @@ -4727,17 +4556,13 @@ static int yaffs_check_dev_fns(const struct yaffs_dev *dev) static int yaffs_create_initial_dir(struct yaffs_dev *dev) { - /* Initialise the unlinked, deleted, root and lost and found directories */ - + /* Initialise the unlinked, deleted, root and lost+found directories */ dev->lost_n_found = dev->root_dir = NULL; dev->unlinked_dir = dev->del_dir = NULL; - dev->unlinked_dir = yaffs_create_fake_dir(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR); - dev->del_dir = yaffs_create_fake_dir(dev, YAFFS_OBJECTID_DELETED, S_IFDIR); - dev->root_dir = yaffs_create_fake_dir(dev, YAFFS_OBJECTID_ROOT, YAFFS_ROOT_MODE | S_IFDIR); @@ -4750,7 +4575,6 @@ static int yaffs_create_initial_dir(struct yaffs_dev *dev) yaffs_add_obj_to_dir(dev->root_dir, dev->lost_n_found); return YAFFS_OK; } - return YAFFS_FAIL; } @@ -4760,7 +4584,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) unsigned x; int bits; - yaffs_trace(YAFFS_TRACE_TRACING, "yaffs: yaffs_guts_initialise()" ); + yaffs_trace(YAFFS_TRACE_TRACING, "yaffs: yaffs_guts_initialise()"); /* Check stuff that must be set */ @@ -4771,6 +4595,11 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) return YAFFS_FAIL; } + if (dev->is_mounted) { + yaffs_trace(YAFFS_TRACE_ALWAYS, "device already mounted"); + return YAFFS_FAIL; + } + dev->internal_start_block = dev->param.start_block; dev->internal_end_block = dev->param.end_block; dev->block_offset = 0; @@ -4795,9 +4624,9 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) (dev->param.inband_tags && !dev->param.is_yaffs2) || dev->param.chunks_per_block < 2 || dev->param.n_reserved_blocks < 2 || - dev->internal_start_block <= 0 || - dev->internal_end_block <= 0 || - dev->internal_end_block <= + dev->internal_start_block <= 0 || + dev->internal_end_block <= 0 || + dev->internal_end_block <= (dev->internal_start_block + dev->param.n_reserved_blocks + 2) ) { /* otherwise it is too small */ @@ -4831,12 +4660,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) return YAFFS_FAIL; } - if (dev->is_mounted) { - yaffs_trace(YAFFS_TRACE_ALWAYS, "device already mounted"); - return YAFFS_FAIL; - } - - /* Finished with most checks. One or two more checks happen later on too. */ + /* Finished with most checks. Further checks happen later on too. */ dev->is_mounted = 1; @@ -4873,7 +4697,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) dev->tnode_width = bits; } else { dev->tnode_width = 16; - } + } dev->tnode_mask = (1 << dev->tnode_width) - 1; @@ -4904,7 +4728,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) return YAFFS_FAIL; } - /* OK, we've finished verifying the device, lets continue with initialisation */ + /* Finished verifying the device, continue with initialisation */ /* More device initialisation */ dev->all_gcs = 0; @@ -4924,7 +4748,8 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) dev->n_erase_failures = 0; dev->n_erased_blocks = 0; dev->gc_disable = 0; - dev->has_pending_prioritised_gc = 1; /* Assume the worst for now, will get fixed on first GC */ + dev->has_pending_prioritised_gc = 1; + /* Assume the worst for now, will get fixed on first GC */ INIT_LIST_HEAD(&dev->dirty_dirs); dev->oldest_dirty_seq = 0; dev->oldest_dirty_block = 0; @@ -4986,18 +4811,24 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) if (!init_failed && !yaffs_create_initial_dir(dev)) init_failed = 1; + if(!init_failed && dev->param.is_yaffs2 && + !dev->param.disable_summary && + !yaffs_summary_init(dev)) + init_failed = 1; + if (!init_failed) { /* Now scan the flash. */ if (dev->param.is_yaffs2) { if (yaffs2_checkpt_restore(dev)) { yaffs_check_obj_details_loaded(dev->root_dir); - yaffs_trace(YAFFS_TRACE_CHECKPOINT | YAFFS_TRACE_MOUNT, + yaffs_trace(YAFFS_TRACE_CHECKPOINT | + YAFFS_TRACE_MOUNT, "yaffs: restored from checkpoint" ); } else { - /* Clean up the mess caused by an aborted checkpoint load - * and scan backwards. + /* Clean up the mess caused by an aborted + * checkpoint load then scan backwards. */ yaffs_deinit_blocks(dev); @@ -5025,7 +4856,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) } } else if (!yaffs1_scan(dev)) { init_failed = 1; - } + } yaffs_strip_deleted_objs(dev); yaffs_fix_hanging_objs(dev); @@ -5047,7 +4878,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) dev->n_page_writes = 0; dev->n_erasures = 0; dev->n_gc_copies = 0; - dev->n_retired_writes = 0; + dev->n_retried_writes = 0; dev->n_retired_blocks = 0; @@ -5061,7 +4892,6 @@ int yaffs_guts_initialise(struct yaffs_dev *dev) yaffs_trace(YAFFS_TRACE_TRACING, "yaffs: yaffs_guts_initialise() done."); return YAFFS_OK; - } void yaffs_deinitialise(struct yaffs_dev *dev) @@ -5071,11 +4901,12 @@ void yaffs_deinitialise(struct yaffs_dev *dev) yaffs_deinit_blocks(dev); yaffs_deinit_tnodes_and_objs(dev); + yaffs_summary_deinit(dev); + if (dev->param.n_caches > 0 && dev->cache) { for (i = 0; i < dev->param.n_caches; i++) { - if (dev->cache[i].data) - kfree(dev->cache[i].data); + kfree(dev->cache[i].data); dev->cache[i].data = NULL; } @@ -5099,7 +4930,6 @@ int yaffs_count_free_chunks(struct yaffs_dev *dev) { int n_free = 0; int b; - struct yaffs_block_info *blk; blk = dev->block_info; @@ -5118,14 +4948,12 @@ int yaffs_count_free_chunks(struct yaffs_dev *dev) } blk++; } - return n_free; } int yaffs_get_n_free_chunks(struct yaffs_dev *dev) { /* This is what we report to the outside world */ - int n_free; int n_dirty_caches; int blocks_for_checkpt; @@ -5134,7 +4962,7 @@ int yaffs_get_n_free_chunks(struct yaffs_dev *dev) n_free = dev->n_free_chunks; n_free += dev->n_deleted_files; - /* Now count the number of dirty chunks in the cache and subtract those */ + /* Now count and subtract the number of dirty chunks in the cache. */ for (n_dirty_caches = 0, i = 0; i < dev->param.n_caches; i++) { if (dev->cache[i].dirty) @@ -5146,7 +4974,7 @@ int yaffs_get_n_free_chunks(struct yaffs_dev *dev) n_free -= ((dev->param.n_reserved_blocks + 1) * dev->param.chunks_per_block); - /* Now we figure out how much to reserve for the checkpoint and report that... */ + /* Now figure checkpoint space and report that... */ blocks_for_checkpt = yaffs_calc_checkpt_blocks_required(dev); n_free -= (blocks_for_checkpt * dev->param.chunks_per_block); @@ -5155,5 +4983,4 @@ int yaffs_get_n_free_chunks(struct yaffs_dev *dev) n_free = 0; return n_free; - } |