X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.c;h=ce7ed7ebb870ff3a548781f5d817c782e6d2a69e;hp=36e11f53c891aadcaf6e259ed60985bce469f216;hb=a233a8fc212a32a50cc5f572cd4946e91cc9ca93;hpb=7396445d7d0d13469b9505791114b9dc6b76ffe4 diff --git a/yaffs_guts.c b/yaffs_guts.c index 36e11f5..ce7ed7e 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -10,10 +10,10 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #include "yportenv.h" #include "yaffs_trace.h" -#include "yaffsinterface.h" #include "yaffs_guts.h" #include "yaffs_tagsvalidity.h" #include "yaffs_getblockinfo.h" @@ -33,6 +33,8 @@ #include "yaffs_nameval.h" #include "yaffs_allocator.h" +#include "yaffs_attribs.h" + /* Note YAFFS_GC_GOOD_ENOUGH must be <= YAFFS_GC_PASSIVE_THRESHOLD */ #define YAFFS_GC_GOOD_ENOUGH 2 #define YAFFS_GC_PASSIVE_THRESHOLD 4 @@ -42,91 +44,90 @@ /* Robustification (if it ever comes about...) */ -static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block); -static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk, - int erasedOk); -static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk, - const __u8 *data, - const yaffs_ext_tags *tags); -static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk, - const yaffs_ext_tags *tags); +static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block); +static void yaffs_handle_chunk_wr_error(struct yaffs_dev *dev, int nand_chunk, + int erased_ok); +static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk, + const u8 *data, + const struct yaffs_ext_tags *tags); +static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk, + const struct yaffs_ext_tags *tags); /* Other local prototypes */ -static void yaffs_update_parent(yaffs_obj_t *obj); -static int yaffs_unlink_obj(yaffs_obj_t *obj); -static int yaffs_obj_cache_dirty(yaffs_obj_t *obj); +static void yaffs_update_parent(struct yaffs_obj *obj); +static int yaffs_unlink_obj(struct yaffs_obj *obj); +static int yaffs_obj_cache_dirty(struct yaffs_obj *obj); -static int yaffs_write_new_chunk(yaffs_dev_t *dev, - const __u8 *buffer, - yaffs_ext_tags *tags, - int useReserve); +static int yaffs_write_new_chunk(struct yaffs_dev *dev, + const u8 *buffer, + struct yaffs_ext_tags *tags, + int use_reserver); -static yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number, - yaffs_obj_type type); +static struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number, + enum yaffs_obj_type type); -static int yaffs_apply_xattrib_mod(yaffs_obj_t *obj, char *buffer, yaffs_xattr_mod *xmod); +static int yaffs_apply_xattrib_mod(struct yaffs_obj *obj, char *buffer, struct yaffs_xattr_mod *xmod); -static void yaffs_remove_obj_from_dir(yaffs_obj_t *obj); -static int yaffs_check_structures(void); -static int yaffs_generic_obj_del(yaffs_obj_t *in); +static void yaffs_remove_obj_from_dir(struct yaffs_obj *obj); +static int yaffs_generic_obj_del(struct yaffs_obj *in); -static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev, +static int yaffs_check_chunk_erased(struct yaffs_dev *dev, int nand_chunk); -static int yaffs_unlink_worker(yaffs_obj_t *obj); +static int yaffs_unlink_worker(struct yaffs_obj *obj); -static int yaffs_tags_match(const yaffs_ext_tags *tags, int obj_id, - int chunkInObject); +static int yaffs_tags_match(const struct yaffs_ext_tags *tags, int obj_id, + int chunk_obj); -static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve, - yaffs_block_info_t **blockUsedPtr); +static int yaffs_alloc_chunk(struct yaffs_dev *dev, int use_reserver, + struct yaffs_block_info **block_ptr); -static void yaffs_check_obj_details_loaded(yaffs_obj_t *in); +static void yaffs_check_obj_details_loaded(struct yaffs_obj *in); -static void yaffs_invalidate_whole_cache(yaffs_obj_t *in); -static void yaffs_invalidate_chunk_cache(yaffs_obj_t *object, int chunk_id); +static void yaffs_invalidate_whole_cache(struct yaffs_obj *in); +static void yaffs_invalidate_chunk_cache(struct yaffs_obj *object, int chunk_id); -static int yaffs_find_chunk_in_file(yaffs_obj_t *in, int inode_chunk, - yaffs_ext_tags *tags); +static int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk, + struct yaffs_ext_tags *tags); -static int yaffs_verify_chunk_written(yaffs_dev_t *dev, +static int yaffs_verify_chunk_written(struct yaffs_dev *dev, int nand_chunk, - const __u8 *data, - yaffs_ext_tags *tags); + const u8 *data, + struct yaffs_ext_tags *tags); -static void yaffs_load_name_from_oh(yaffs_dev_t *dev,YCHAR *name, const YCHAR *ohName, int bufferSize); -static void yaffs_load_oh_from_name(yaffs_dev_t *dev,YCHAR *ohName, const YCHAR *name); +static void yaffs_load_name_from_oh(struct yaffs_dev *dev,YCHAR *name, const YCHAR *oh_name, int buff_size); +static void yaffs_load_oh_from_name(struct yaffs_dev *dev,YCHAR *oh_name, const YCHAR *name); /* Function to calculate chunk and offset */ -static void yaffs_addr_to_chunk(yaffs_dev_t *dev, loff_t addr, int *chunkOut, - __u32 *offsetOut) +static void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr, int *chunk_out, + u32 *offset_out) { int chunk; - __u32 offset; + u32 offset; - chunk = (__u32)(addr >> dev->chunk_shift); + chunk = (u32)(addr >> dev->chunk_shift); if (dev->chunk_div == 1) { /* easy power of 2 case */ - offset = (__u32)(addr & dev->chunk_mask); + offset = (u32)(addr & dev->chunk_mask); } else { /* Non power-of-2 case */ - loff_t chunkBase; + loff_t chunk_base; chunk /= dev->chunk_div; - chunkBase = ((loff_t)chunk) * dev->data_bytes_per_chunk; - offset = (__u32)(addr - chunkBase); + chunk_base = ((loff_t)chunk) * dev->data_bytes_per_chunk; + offset = (u32)(addr - chunk_base); } - *chunkOut = chunk; - *offsetOut = offset; + *chunk_out = chunk; + *offset_out = offset; } /* Function to return the number of shifts for a power of 2 greater than or @@ -135,44 +136,44 @@ static void yaffs_addr_to_chunk(yaffs_dev_t *dev, loff_t addr, int *chunkOut, * be hellishly efficient. */ -static __u32 ShiftsGE(__u32 x) +static u32 calc_shifts_ceiling(u32 x) { - int extraBits; - int nShifts; + int extra_bits; + int shifts; - nShifts = extraBits = 0; + shifts = extra_bits = 0; while (x > 1) { if (x & 1) - extraBits++; + extra_bits++; x >>= 1; - nShifts++; + shifts++; } - if (extraBits) - nShifts++; + if (extra_bits) + shifts++; - return nShifts; + return shifts; } /* Function to return the number of shifts to get a 1 in bit 0 */ -static __u32 Shifts(__u32 x) +static u32 calc_shifts(u32 x) { - __u32 nShifts; + u32 shifts; - nShifts = 0; + shifts = 0; if (!x) return 0; while (!(x&1)) { x >>= 1; - nShifts++; + shifts++; } - return nShifts; + return shifts; } @@ -181,10 +182,10 @@ static __u32 Shifts(__u32 x) * Temporary buffer manipulations. */ -static int yaffs_init_tmp_buffers(yaffs_dev_t *dev) +static int yaffs_init_tmp_buffers(struct yaffs_dev *dev) { int i; - __u8 *buf = (__u8 *)1; + u8 *buf = (u8 *)1; memset(dev->temp_buffer, 0, sizeof(dev->temp_buffer)); @@ -197,7 +198,7 @@ static int yaffs_init_tmp_buffers(yaffs_dev_t *dev) return buf ? YAFFS_OK : YAFFS_FAIL; } -__u8 *yaffs_get_temp_buffer(yaffs_dev_t *dev, int line_no) +u8 *yaffs_get_temp_buffer(struct yaffs_dev *dev, int line_no) { int i, j; @@ -237,7 +238,7 @@ __u8 *yaffs_get_temp_buffer(yaffs_dev_t *dev, int line_no) } -void yaffs_release_temp_buffer(yaffs_dev_t *dev, __u8 *buffer, +void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 *buffer, int line_no) { int i; @@ -265,7 +266,7 @@ void yaffs_release_temp_buffer(yaffs_dev_t *dev, __u8 *buffer, /* * Determine if we have a managed buffer. */ -int yaffs_is_managed_tmp_buffer(yaffs_dev_t *dev, const __u8 *buffer) +int yaffs_is_managed_tmp_buffer(struct yaffs_dev *dev, const u8 *buffer) { int i; @@ -309,12 +310,12 @@ static Y_INLINE int yaffs_hash_fn(int n) * Note that root might have a presence in NAND if permissions are set. */ -yaffs_obj_t *yaffs_root(yaffs_dev_t *dev) +struct yaffs_obj *yaffs_root(struct yaffs_dev *dev) { return dev->root_dir; } -yaffs_obj_t *yaffs_lost_n_found(yaffs_dev_t *dev) +struct yaffs_obj *yaffs_lost_n_found(struct yaffs_dev *dev) { return dev->lost_n_found; } @@ -324,7 +325,7 @@ yaffs_obj_t *yaffs_lost_n_found(yaffs_dev_t *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--) { @@ -335,12 +336,12 @@ int yaffs_check_ff(__u8 *buffer, int n_bytes) return 1; } -static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev, +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__); - yaffs_ext_tags tags; + u8 *data = yaffs_get_temp_buffer(dev, __LINE__); + struct yaffs_ext_tags tags; int result; result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, data, &tags); @@ -361,21 +362,21 @@ static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev, } -static int yaffs_verify_chunk_written(yaffs_dev_t *dev, +static int yaffs_verify_chunk_written(struct yaffs_dev *dev, int nand_chunk, - const __u8 *data, - yaffs_ext_tags *tags) + const u8 *data, + struct yaffs_ext_tags *tags) { int retval = YAFFS_OK; - yaffs_ext_tags tempTags; - __u8 *buffer = yaffs_get_temp_buffer(dev,__LINE__); + struct yaffs_ext_tags temp_tags; + u8 *buffer = yaffs_get_temp_buffer(dev,__LINE__); int result; - result = yaffs_rd_chunk_tags_nand(dev,nand_chunk,buffer,&tempTags); + result = yaffs_rd_chunk_tags_nand(dev,nand_chunk,buffer,&temp_tags); if(memcmp(buffer,data,dev->data_bytes_per_chunk) || - tempTags.obj_id != tags->obj_id || - tempTags.chunk_id != tags->chunk_id || - tempTags.n_bytes != tags->n_bytes) + temp_tags.obj_id != tags->obj_id || + temp_tags.chunk_id != tags->chunk_id || + temp_tags.n_bytes != tags->n_bytes) retval = YAFFS_FAIL; yaffs_release_temp_buffer(dev, buffer, __LINE__); @@ -383,22 +384,22 @@ static int yaffs_verify_chunk_written(yaffs_dev_t *dev, return retval; } -static int yaffs_write_new_chunk(struct yaffs_dev_s *dev, - const __u8 *data, - yaffs_ext_tags *tags, - int useReserve) +static int yaffs_write_new_chunk(struct yaffs_dev *dev, + const u8 *data, + struct yaffs_ext_tags *tags, + int use_reserver) { int attempts = 0; - int writeOk = 0; + int write_ok = 0; int chunk; yaffs2_checkpt_invalidate(dev); do { - yaffs_block_info_t *bi = 0; - int erasedOk = 0; + struct yaffs_block_info *bi = 0; + int erased_ok = 0; - chunk = yaffs_alloc_chunk(dev, useReserve, &bi); + chunk = yaffs_alloc_chunk(dev, use_reserver, &bi); if (chunk < 0) { /* no space */ break; @@ -435,8 +436,8 @@ static int yaffs_write_new_chunk(struct yaffs_dev_s *dev, bi->skip_erased_check = 0; if (!bi->skip_erased_check) { - erasedOk = yaffs_check_chunk_erased(dev, chunk); - if (erasedOk != YAFFS_OK) { + erased_ok = yaffs_check_chunk_erased(dev, chunk); + if (erased_ok != YAFFS_OK) { T(YAFFS_TRACE_ERROR, (TSTR("**>> yaffs chunk %d was not erased" TENDSTR), chunk)); @@ -450,16 +451,16 @@ static int yaffs_write_new_chunk(struct yaffs_dev_s *dev, } } - writeOk = yaffs_wr_chunk_tags_nand(dev, chunk, + write_ok = yaffs_wr_chunk_tags_nand(dev, chunk, data, tags); if(!bi->skip_erased_check) - writeOk = yaffs_verify_chunk_written(dev, chunk, data, tags); + write_ok = yaffs_verify_chunk_written(dev, chunk, data, tags); - if (writeOk != YAFFS_OK) { + if (write_ok != YAFFS_OK) { /* Clean up aborted write, skip to next block and * try another chunk */ - yaffs_handle_chunk_wr_error(dev, chunk, erasedOk); + yaffs_handle_chunk_wr_error(dev, chunk, erased_ok); continue; } @@ -468,10 +469,10 @@ static int yaffs_write_new_chunk(struct yaffs_dev_s *dev, /* Copy the data into the robustification buffer */ yaffs_handle_chunk_wr_ok(dev, chunk, data, tags); - } while (writeOk != YAFFS_OK && + } while (write_ok != YAFFS_OK && (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts)); - if (!writeOk) + if (!write_ok) chunk = -1; if (attempts > 1) { @@ -491,9 +492,9 @@ static int yaffs_write_new_chunk(struct yaffs_dev_s *dev, * Block retiring for handling a broken block. */ -static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block) +static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block) { - yaffs_block_info_t *bi = yaffs_get_block_info(dev, flash_block); + struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block); yaffs2_checkpt_invalidate(dev); @@ -505,10 +506,10 @@ static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block) "yaffs: Failed to mark bad and erase block %d" TENDSTR), flash_block)); } else { - yaffs_ext_tags tags; + struct yaffs_ext_tags tags; 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, __LINE__); memset(buffer, 0xff, dev->data_bytes_per_chunk); yaffs_init_tags(&tags); @@ -535,9 +536,9 @@ static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block) * */ -static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk, - const __u8 *data, - const yaffs_ext_tags *tags) +static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk, + const u8 *data, + const struct yaffs_ext_tags *tags) { dev=dev; nand_chunk=nand_chunk; @@ -545,15 +546,15 @@ static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk, tags=tags; } -static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk, - const yaffs_ext_tags *tags) +static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk, + const struct yaffs_ext_tags *tags) { dev=dev; nand_chunk=nand_chunk; tags=tags; } -void yaffs_handle_chunk_error(yaffs_dev_t *dev, yaffs_block_info_t *bi) +void yaffs_handle_chunk_error(struct yaffs_dev *dev, struct yaffs_block_info *bi) { if (!bi->gc_prioritise) { bi->gc_prioritise = 1; @@ -568,15 +569,15 @@ void yaffs_handle_chunk_error(yaffs_dev_t *dev, yaffs_block_info_t *bi) } } -static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk, - int erasedOk) +static void yaffs_handle_chunk_wr_error(struct yaffs_dev *dev, int nand_chunk, + int erased_ok) { int flash_block = nand_chunk / dev->param.chunks_per_block; - yaffs_block_info_t *bi = yaffs_get_block_info(dev, flash_block); + struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block); yaffs_handle_chunk_error(dev, bi); - if (erasedOk) { + if (erased_ok) { /* Was an actual write failure, so mark the block for retirement */ bi->needs_retiring = 1; T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, @@ -591,20 +592,17 @@ static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk, /*---------------- 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; + u16 sum = 0; + u16 i = 1; const YUCHAR *bname = (const YUCHAR *) name; if (bname) { while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) { -#ifdef CONFIG_YAFFS_CASE_INSENSITIVE - sum += yaffs_toupper(*bname) * i; -#else - sum += (*bname) * i; -#endif + /* 0x1f mask is case insensitive */ + sum += ((*bname) & 0x1f) * i; i++; bname++; } @@ -612,7 +610,7 @@ static __u16 yaffs_calc_name_sum(const YCHAR *name) return sum; } -void yaffs_set_obj_name(yaffs_obj_t *obj, const YCHAR *name) +void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR *name) { #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM memset(obj->short_name, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1)); @@ -624,13 +622,13 @@ void yaffs_set_obj_name(yaffs_obj_t *obj, const YCHAR *name) obj->sum = yaffs_calc_name_sum(name); } -void yaffs_set_obj_name_from_oh(yaffs_obj_t *obj, const yaffs_obj_header *oh) +void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj, const struct yaffs_obj_hdr *oh) { #ifdef CONFIG_YAFFS_AUTO_UNICODE - YCHAR tmpName[YAFFS_MAX_NAME_LENGTH+1]; - memset(tmpName,0,sizeof(tmpName)); - yaffs_load_name_from_oh(obj->my_dev,tmpName,oh->name,YAFFS_MAX_NAME_LENGTH+1); - yaffs_set_obj_name(obj,tmpName); + YCHAR tmp_name[YAFFS_MAX_NAME_LENGTH+1]; + memset(tmp_name,0,sizeof(tmp_name)); + yaffs_load_name_from_oh(obj->my_dev,tmp_name,oh->name,YAFFS_MAX_NAME_LENGTH+1); + yaffs_set_obj_name(obj,tmp_name); #else yaffs_set_obj_name(obj,oh->name); #endif @@ -644,9 +642,9 @@ void yaffs_set_obj_name_from_oh(yaffs_obj_t *obj, const yaffs_obj_header *oh) */ -yaffs_tnode_t *yaffs_get_tnode(yaffs_dev_t *dev) +struct yaffs_tnode *yaffs_get_tnode(struct yaffs_dev *dev) { - yaffs_tnode_t *tn = yaffs_alloc_raw_tnode(dev); + struct yaffs_tnode *tn = yaffs_alloc_raw_tnode(dev); if (tn){ memset(tn, 0, dev->tnode_size); dev->n_tnodes++; @@ -658,14 +656,14 @@ yaffs_tnode_t *yaffs_get_tnode(yaffs_dev_t *dev) } /* FreeTnode frees up a tnode and puts it back on the free list */ -static void yaffs_free_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn) +static void yaffs_free_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn) { yaffs_free_raw_tnode(dev,tn); dev->n_tnodes--; dev->checkpoint_blocks_required = 0; /* force recalculation*/ } -static void yaffs_deinit_tnodes_and_objs(yaffs_dev_t *dev) +static void yaffs_deinit_tnodes_and_objs(struct yaffs_dev *dev) { yaffs_deinit_raw_tnodes_and_objs(dev); dev->n_obj = 0; @@ -673,57 +671,57 @@ static void yaffs_deinit_tnodes_and_objs(yaffs_dev_t *dev) } -void yaffs_load_tnode_0(yaffs_dev_t *dev, yaffs_tnode_t *tn, unsigned pos, +void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn, unsigned pos, unsigned val) { - __u32 *map = (__u32 *)tn; - __u32 bitInMap; - __u32 bitInWord; - __u32 wordInMap; - __u32 mask; + u32 *map = (u32 *)tn; + u32 bit_in_map; + u32 bit_in_word; + u32 word_in_map; + u32 mask; pos &= YAFFS_TNODES_LEVEL0_MASK; val >>= dev->chunk_grp_bits; - bitInMap = pos * dev->tnode_width; - wordInMap = bitInMap / 32; - bitInWord = bitInMap & (32 - 1); + bit_in_map = pos * dev->tnode_width; + word_in_map = bit_in_map / 32; + bit_in_word = bit_in_map & (32 - 1); - mask = dev->tnode_mask << bitInWord; + mask = dev->tnode_mask << bit_in_word; - map[wordInMap] &= ~mask; - map[wordInMap] |= (mask & (val << bitInWord)); + map[word_in_map] &= ~mask; + map[word_in_map] |= (mask & (val << bit_in_word)); - if (dev->tnode_width > (32 - bitInWord)) { - bitInWord = (32 - bitInWord); - wordInMap++;; - mask = dev->tnode_mask >> (/*dev->tnode_width -*/ bitInWord); - map[wordInMap] &= ~mask; - map[wordInMap] |= (mask & (val >> bitInWord)); + if (dev->tnode_width > (32 - bit_in_word)) { + bit_in_word = (32 - bit_in_word); + word_in_map++;; + mask = dev->tnode_mask >> (/*dev->tnode_width -*/ bit_in_word); + map[word_in_map] &= ~mask; + map[word_in_map] |= (mask & (val >> bit_in_word)); } } -__u32 yaffs_get_group_base(yaffs_dev_t *dev, yaffs_tnode_t *tn, +u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn, unsigned pos) { - __u32 *map = (__u32 *)tn; - __u32 bitInMap; - __u32 bitInWord; - __u32 wordInMap; - __u32 val; + u32 *map = (u32 *)tn; + u32 bit_in_map; + u32 bit_in_word; + u32 word_in_map; + u32 val; pos &= YAFFS_TNODES_LEVEL0_MASK; - bitInMap = pos * dev->tnode_width; - wordInMap = bitInMap / 32; - bitInWord = bitInMap & (32 - 1); + bit_in_map = pos * dev->tnode_width; + word_in_map = bit_in_map / 32; + bit_in_word = bit_in_map & (32 - 1); - val = map[wordInMap] >> bitInWord; + val = map[word_in_map] >> bit_in_word; - if (dev->tnode_width > (32 - bitInWord)) { - bitInWord = (32 - bitInWord); - wordInMap++;; - val |= (map[wordInMap] << bitInWord); + if (dev->tnode_width > (32 - bit_in_word)) { + bit_in_word = (32 - bit_in_word); + word_in_map++;; + val |= (map[word_in_map] << bit_in_word); } val &= dev->tnode_mask; @@ -740,13 +738,13 @@ __u32 yaffs_get_group_base(yaffs_dev_t *dev, yaffs_tnode_t *tn, */ /* FindLevel0Tnode finds the level 0 tnode, if one exists. */ -yaffs_tnode_t *yaffs_find_tnode_0(yaffs_dev_t *dev, - yaffs_file_s *file_struct, - __u32 chunk_id) +struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev, + struct yaffs_file_var *file_struct, + u32 chunk_id) { - yaffs_tnode_t *tn = file_struct->top; - __u32 i; - int requiredTallness; + struct yaffs_tnode *tn = file_struct->top; + u32 i; + int required_depth; int level = file_struct->top_level; dev=dev; @@ -761,13 +759,13 @@ yaffs_tnode_t *yaffs_find_tnode_0(yaffs_dev_t *dev, /* First check we're tall enough (ie enough top_level) */ i = chunk_id >> YAFFS_TNODES_LEVEL0_BITS; - requiredTallness = 0; + required_depth = 0; while (i) { i >>= YAFFS_TNODES_INTERNAL_BITS; - requiredTallness++; + required_depth++; } - if (requiredTallness > file_struct->top_level) + if (required_depth > file_struct->top_level) return NULL; /* Not tall enough, so we can't find it */ /* Traverse down to level 0 */ @@ -794,17 +792,17 @@ yaffs_tnode_t *yaffs_find_tnode_0(yaffs_dev_t *dev, * be plugged into the ttree. */ -yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev, - yaffs_file_s *file_struct, - __u32 chunk_id, - yaffs_tnode_t *passed_tn) +struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev, + struct yaffs_file_var *file_struct, + u32 chunk_id, + struct yaffs_tnode *passed_tn) { - int requiredTallness; + int required_depth; int i; int l; - yaffs_tnode_t *tn; + struct yaffs_tnode *tn; - __u32 x; + u32 x; /* Check sane level and page Id */ @@ -817,16 +815,16 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev, /* First check we're tall enough (ie enough top_level) */ x = chunk_id >> YAFFS_TNODES_LEVEL0_BITS; - requiredTallness = 0; + required_depth = 0; while (x) { x >>= YAFFS_TNODES_INTERNAL_BITS; - requiredTallness++; + required_depth++; } - if (requiredTallness > file_struct->top_level) { + if (required_depth > file_struct->top_level) { /* Not tall enough, gotta make the tree taller */ - for (i = file_struct->top_level; i < requiredTallness; i++) { + for (i = file_struct->top_level; i < required_depth; i++) { tn = yaffs_get_tnode(dev); @@ -890,142 +888,46 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev, return tn; } -static int yaffs_find_chunk_in_group(yaffs_dev_t *dev, int theChunk, - yaffs_ext_tags *tags, int obj_id, +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) { int j; - for (j = 0; theChunk && j < dev->chunk_grp_size; j++) { - if (yaffs_check_chunk_bit(dev, theChunk / dev->param.chunks_per_block, - theChunk % dev->param.chunks_per_block)) { + for (j = 0; the_chunk && j < dev->chunk_grp_size; j++) { + if (yaffs_check_chunk_bit(dev, the_chunk / dev->param.chunks_per_block, + the_chunk % dev->param.chunks_per_block)) { if(dev->chunk_grp_size == 1) - return theChunk; + return the_chunk; else { - yaffs_rd_chunk_tags_nand(dev, theChunk, NULL, + yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL, tags); if (yaffs_tags_match(tags, obj_id, inode_chunk)) { /* found it; */ - return theChunk; + return the_chunk; } } } - theChunk++; + the_chunk++; } return -1; } -#if 0 -/* Experimental code not being used yet. Might speed up file deletion */ -/* DeleteWorker scans backwards through the tnode tree and deletes all the - * chunks and tnodes in the file. - * Returns 1 if the tree was deleted. - * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete. - */ -static int yaffs_del_worker(yaffs_obj_t *in, yaffs_tnode_t *tn, __u32 level, - int chunk_offset, int *limit) +static void yaffs_soft_del_chunk(struct yaffs_dev *dev, int chunk) { - int i; - int inode_chunk; - int theChunk; - yaffs_ext_tags tags; - int foundChunk; - yaffs_dev_t *dev = in->my_dev; - - int allDone = 1; - - if (tn) { - if (level > 0) { - for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0; - i--) { - if (tn->internal[i]) { - if (limit && (*limit) < 0) { - allDone = 0; - } else { - allDone = - yaffs_del_worker(in, - tn-> - internal - [i], - level - - 1, - (chunk_offset - << - YAFFS_TNODES_INTERNAL_BITS) - + i, - limit); - } - if (allDone) { - yaffs_free_tnode(dev, - tn-> - internal[i]); - tn->internal[i] = NULL; - } - } - } - return (allDone) ? 1 : 0; - } else if (level == 0) { - int hitLimit = 0; - - for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit; - i--) { - theChunk = yaffs_get_group_base(dev, tn, i); - if (theChunk) { - - inode_chunk = (chunk_offset << - YAFFS_TNODES_LEVEL0_BITS) + i; - - foundChunk = - yaffs_find_chunk_in_group(dev, - theChunk, - &tags, - in->obj_id, - inode_chunk); - - if (foundChunk > 0) { - yaffs_chunk_del(dev, - foundChunk, 1, - __LINE__); - in->n_data_chunks--; - if (limit) { - *limit = *limit - 1; - if (*limit <= 0) - hitLimit = 1; - } - - } - - yaffs_load_tnode_0(dev, tn, i, 0); - } - - } - return (i < 0) ? 1 : 0; - - } - - } - - return 1; - -} - -#endif - -static void yaffs_soft_del_chunk(yaffs_dev_t *dev, int chunk) -{ - yaffs_block_info_t *theBlock; + struct yaffs_block_info *the_block; unsigned block_no; T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk)); block_no = chunk / dev->param.chunks_per_block; - theBlock = yaffs_get_block_info(dev, block_no); - if (theBlock) { - theBlock->soft_del_pages++; + the_block = yaffs_get_block_info(dev, block_no); + if (the_block) { + the_block->soft_del_pages++; dev->n_free_chunks++; - yaffs2_update_oldest_dirty_seq(dev, block_no, theBlock); + yaffs2_update_oldest_dirty_seq(dev, block_no, the_block); } } @@ -1035,21 +937,21 @@ static void yaffs_soft_del_chunk(yaffs_dev_t *dev, int chunk) * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted. */ -static int yaffs_soft_del_worker(yaffs_obj_t *in, yaffs_tnode_t *tn, - __u32 level, int chunk_offset) +static int yaffs_soft_del_worker(struct yaffs_obj *in, struct yaffs_tnode *tn, + u32 level, int chunk_offset) { int i; - int theChunk; - int allDone = 1; - yaffs_dev_t *dev = in->my_dev; + int the_chunk; + int all_done = 1; + struct yaffs_dev *dev = in->my_dev; if (tn) { if (level > 0) { - for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0; + for (i = YAFFS_NTNODES_INTERNAL - 1; all_done && i >= 0; i--) { if (tn->internal[i]) { - allDone = + all_done = yaffs_soft_del_worker(in, tn-> internal[i], @@ -1058,7 +960,7 @@ static int yaffs_soft_del_worker(yaffs_obj_t *in, yaffs_tnode_t *tn, << YAFFS_TNODES_INTERNAL_BITS) + i); - if (allDone) { + if (all_done) { yaffs_free_tnode(dev, tn-> internal[i]); @@ -1068,17 +970,17 @@ static int yaffs_soft_del_worker(yaffs_obj_t *in, yaffs_tnode_t *tn, } } } - return (allDone) ? 1 : 0; + return (all_done) ? 1 : 0; } else if (level == 0) { for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) { - theChunk = yaffs_get_group_base(dev, tn, i); - if (theChunk) { + 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, theChunk); + yaffs_soft_del_chunk(dev, the_chunk); yaffs_load_tnode_0(dev, tn, i, 0); } @@ -1093,7 +995,7 @@ static int yaffs_soft_del_worker(yaffs_obj_t *in, yaffs_tnode_t *tn, } -static void yaffs_soft_del_file(yaffs_obj_t *obj) +static void yaffs_soft_del_file(struct yaffs_obj *obj) { if (obj->deleted && obj->variant_type == YAFFS_OBJECT_TYPE_FILE && !obj->soft_del) { @@ -1131,14 +1033,14 @@ static void yaffs_soft_del_file(yaffs_obj_t *obj) * If there is no data in a subtree then it is pruned. */ -static yaffs_tnode_t *yaffs_prune_worker(yaffs_dev_t *dev, yaffs_tnode_t *tn, - __u32 level, int del0) +static struct yaffs_tnode *yaffs_prune_worker(struct yaffs_dev *dev, struct yaffs_tnode *tn, + u32 level, int del0) { int i; - int hasData; + int has_data; if (tn) { - hasData = 0; + has_data = 0; if(level > 0){ for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) { @@ -1150,19 +1052,19 @@ static yaffs_tnode_t *yaffs_prune_worker(yaffs_dev_t *dev, yaffs_tnode_t *tn, } if (tn->internal[i]) - hasData++; + has_data++; } } else { - int tnode_size_u32 = dev->tnode_size/sizeof(__u32); - __u32 *map = (__u32 *)tn; + int tnode_size_u32 = dev->tnode_size/sizeof(u32); + u32 *map = (u32 *)tn; - for(i = 0; !hasData && i < tnode_size_u32; i++){ + for(i = 0; !has_data && i < tnode_size_u32; i++){ if(map[i]) - hasData++; + has_data++; } } - if (hasData == 0 && del0) { + if (has_data == 0 && del0) { /* Free and return NULL */ yaffs_free_tnode(dev, tn); @@ -1175,13 +1077,13 @@ static yaffs_tnode_t *yaffs_prune_worker(yaffs_dev_t *dev, yaffs_tnode_t *tn, } -static int yaffs_prune_tree(yaffs_dev_t *dev, - yaffs_file_s *file_struct) +static int yaffs_prune_tree(struct yaffs_dev *dev, + struct yaffs_file_var *file_struct) { int i; - int hasData; + int has_data; int done = 0; - yaffs_tnode_t *tn; + struct yaffs_tnode *tn; if (file_struct->top_level > 0) { file_struct->top = @@ -1197,13 +1099,13 @@ static int yaffs_prune_tree(yaffs_dev_t *dev, while (file_struct->top_level && !done) { tn = file_struct->top; - hasData = 0; + has_data = 0; for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) { if (tn->internal[i]) - hasData++; + has_data++; } - if (!hasData) { + if (!has_data) { file_struct->top = tn->internal[0]; file_struct->top_level--; yaffs_free_tnode(dev, tn); @@ -1220,35 +1122,35 @@ static int yaffs_prune_tree(yaffs_dev_t *dev, /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */ -static yaffs_obj_t *yaffs_alloc_empty_obj(yaffs_dev_t *dev) +static struct yaffs_obj *yaffs_alloc_empty_obj(struct yaffs_dev *dev) { - yaffs_obj_t *obj = yaffs_alloc_raw_obj(dev); + struct yaffs_obj *obj = yaffs_alloc_raw_obj(dev); if (obj) { dev->n_obj++; /* Now sweeten it up... */ - memset(obj, 0, sizeof(yaffs_obj_t)); + memset(obj, 0, sizeof(struct yaffs_obj)); obj->being_created = 1; obj->my_dev = dev; obj->hdr_chunk = 0; obj->variant_type = YAFFS_OBJECT_TYPE_UNKNOWN; - YINIT_LIST_HEAD(&(obj->hard_links)); - YINIT_LIST_HEAD(&(obj->hash_link)); - YINIT_LIST_HEAD(&obj->siblings); + INIT_LIST_HEAD(&(obj->hard_links)); + INIT_LIST_HEAD(&(obj->hash_link)); + INIT_LIST_HEAD(&obj->siblings); /* Now make the directory sane */ if (dev->root_dir) { obj->parent = dev->root_dir; - ylist_add(&(obj->siblings), &dev->root_dir->variant.dir_variant.children); + 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 lostNFound in lostNFound so - * check if lostNFound exists first + * 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); @@ -1261,11 +1163,11 @@ static yaffs_obj_t *yaffs_alloc_empty_obj(yaffs_dev_t *dev) return obj; } -static yaffs_obj_t *yaffs_create_fake_dir(yaffs_dev_t *dev, int number, - __u32 mode) +static struct yaffs_obj *yaffs_create_fake_dir(struct yaffs_dev *dev, int number, + u32 mode) { - yaffs_obj_t *obj = + 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... */ @@ -1282,23 +1184,23 @@ static yaffs_obj_t *yaffs_create_fake_dir(yaffs_dev_t *dev, int number, } -static void yaffs_unhash_obj(yaffs_obj_t *obj) +static void yaffs_unhash_obj(struct yaffs_obj *obj) { int bucket; - yaffs_dev_t *dev = obj->my_dev; + struct yaffs_dev *dev = obj->my_dev; /* If it is still linked into the bucket list, free from the list */ - if (!ylist_empty(&obj->hash_link)) { - ylist_del_init(&obj->hash_link); + if (!list_empty(&obj->hash_link)) { + list_del_init(&obj->hash_link); bucket = yaffs_hash_fn(obj->obj_id); dev->obj_bucket[bucket].count--; } } /* FreeObject frees up a Object and puts it back on the free list */ -static void yaffs_free_obj(yaffs_obj_t *obj) +static void yaffs_free_obj(struct yaffs_obj *obj) { - yaffs_dev_t *dev = obj->my_dev; + struct yaffs_dev *dev = obj->my_dev; T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), obj, obj->my_inode)); @@ -1306,7 +1208,7 @@ static void yaffs_free_obj(yaffs_obj_t *obj) YBUG(); if (obj->parent) YBUG(); - if (!ylist_empty(&obj->siblings)) + if (!list_empty(&obj->siblings)) YBUG(); @@ -1326,13 +1228,13 @@ static void yaffs_free_obj(yaffs_obj_t *obj) } -void yaffs_handle_defered_free(yaffs_obj_t *obj) +void yaffs_handle_defered_free(struct yaffs_obj *obj) { if (obj->defered_free) yaffs_free_obj(obj); } -static void yaffs_init_tnodes_and_objs(yaffs_dev_t *dev) +static void yaffs_init_tnodes_and_objs(struct yaffs_dev *dev) { int i; @@ -1342,12 +1244,12 @@ static void yaffs_init_tnodes_and_objs(yaffs_dev_t *dev) yaffs_init_raw_tnodes_and_objs(dev); for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { - YINIT_LIST_HEAD(&dev->obj_bucket[i].list); + INIT_LIST_HEAD(&dev->obj_bucket[i].list); dev->obj_bucket[i].count = 0; } } -static int yaffs_find_nice_bucket(yaffs_dev_t *dev) +static int yaffs_find_nice_bucket(struct yaffs_dev *dev) { int i; int l = 999; @@ -1371,7 +1273,7 @@ static int yaffs_find_nice_bucket(yaffs_dev_t *dev) return l; } -static int yaffs_new_obj_id(yaffs_dev_t *dev) +static int yaffs_new_obj_id(struct yaffs_dev *dev) { int bucket = yaffs_find_nice_bucket(dev); @@ -1380,9 +1282,9 @@ static int yaffs_new_obj_id(yaffs_dev_t *dev) */ int found = 0; - struct ylist_head *i; + struct list_head *i; - __u32 n = (__u32) bucket; + u32 n = (u32) bucket; /* yaffs_check_obj_hash_sane(); */ @@ -1390,9 +1292,9 @@ static int yaffs_new_obj_id(yaffs_dev_t *dev) found = 1; n += YAFFS_NOBJECT_BUCKETS; if (1 || dev->obj_bucket[bucket].count > 0) { - ylist_for_each(i, &dev->obj_bucket[bucket].list) { + list_for_each(i, &dev->obj_bucket[bucket].list) { /* If there is already one in the list */ - if (i && ylist_entry(i, yaffs_obj_t, + if (i && list_entry(i, struct yaffs_obj, hash_link)->obj_id == n) { found = 0; } @@ -1403,25 +1305,25 @@ static int yaffs_new_obj_id(yaffs_dev_t *dev) return n; } -static void yaffs_hash_obj(yaffs_obj_t *in) +static void yaffs_hash_obj(struct yaffs_obj *in) { int bucket = yaffs_hash_fn(in->obj_id); - yaffs_dev_t *dev = in->my_dev; + struct yaffs_dev *dev = in->my_dev; - ylist_add(&in->hash_link, &dev->obj_bucket[bucket].list); + list_add(&in->hash_link, &dev->obj_bucket[bucket].list); dev->obj_bucket[bucket].count++; } -yaffs_obj_t *yaffs_find_by_number(yaffs_dev_t *dev, __u32 number) +struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number) { int bucket = yaffs_hash_fn(number); - struct ylist_head *i; - yaffs_obj_t *in; + struct list_head *i; + struct yaffs_obj *in; - ylist_for_each(i, &dev->obj_bucket[bucket].list) { + list_for_each(i, &dev->obj_bucket[bucket].list) { /* Look if it is in the list */ if (i) { - in = ylist_entry(i, yaffs_obj_t, hash_link); + 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 */ @@ -1436,11 +1338,11 @@ yaffs_obj_t *yaffs_find_by_number(yaffs_dev_t *dev, __u32 number) return NULL; } -yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number, - yaffs_obj_type type) +struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number, + enum yaffs_obj_type type) { - yaffs_obj_t *theObject=NULL; - yaffs_tnode_t *tn = NULL; + struct yaffs_obj *the_obj=NULL; + struct yaffs_tnode *tn = NULL; if (number < 0) number = yaffs_new_obj_id(dev); @@ -1451,45 +1353,35 @@ yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number, return NULL; } - theObject = yaffs_alloc_empty_obj(dev); - if (!theObject){ + the_obj = yaffs_alloc_empty_obj(dev); + if (!the_obj){ if(tn) yaffs_free_tnode(dev,tn); return NULL; } - if (theObject) { - theObject->fake = 0; - theObject->rename_allowed = 1; - theObject->unlink_allowed = 1; - theObject->obj_id = number; - yaffs_hash_obj(theObject); - theObject->variant_type = type; -#ifdef CONFIG_YAFFS_WINCE - yfsd_win_file_time_now(theObject->win_atime); - theObject->win_ctime[0] = theObject->win_mtime[0] = - theObject->win_atime[0]; - theObject->win_ctime[1] = theObject->win_mtime[1] = - theObject->win_atime[1]; + 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); -#else - - theObject->yst_atime = theObject->yst_mtime = - theObject->yst_ctime = Y_CURRENT_TIME; -#endif switch (type) { case YAFFS_OBJECT_TYPE_FILE: - theObject->variant.file_variant.file_size = 0; - theObject->variant.file_variant.scanned_size = 0; - theObject->variant.file_variant.shrink_size = 0xFFFFFFFF; /* max __u32 */ - theObject->variant.file_variant.top_level = 0; - theObject->variant.file_variant.top = tn; + 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: - YINIT_LIST_HEAD(&theObject->variant.dir_variant. + INIT_LIST_HEAD(&the_obj->variant.dir_variant. children); - YINIT_LIST_HEAD(&theObject->variant.dir_variant. + INIT_LIST_HEAD(&the_obj->variant.dir_variant. dirty); break; case YAFFS_OBJECT_TYPE_SYMLINK: @@ -1503,71 +1395,71 @@ yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number, } } - return theObject; + return the_obj; } -yaffs_obj_t *yaffs_find_or_create_by_number(yaffs_dev_t *dev, +struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev, int number, - yaffs_obj_type type) + enum yaffs_obj_type type) { - yaffs_obj_t *theObject = NULL; + struct yaffs_obj *the_obj = NULL; if (number > 0) - theObject = yaffs_find_by_number(dev, number); + the_obj = yaffs_find_by_number(dev, number); - if (!theObject) - theObject = yaffs_new_obj(dev, number, type); + if (!the_obj) + the_obj = yaffs_new_obj(dev, number, type); - return theObject; + return the_obj; } YCHAR *yaffs_clone_str(const YCHAR *str) { - YCHAR *newStr = NULL; + YCHAR *new_str = NULL; int len; if (!str) str = _Y(""); len = yaffs_strnlen(str,YAFFS_MAX_ALIAS_LENGTH); - newStr = YMALLOC((len + 1) * sizeof(YCHAR)); - if (newStr){ - yaffs_strncpy(newStr, str,len); - newStr[len] = 0; + new_str = YMALLOC((len + 1) * sizeof(YCHAR)); + if (new_str){ + yaffs_strncpy(new_str, str,len); + new_str[len] = 0; } - return newStr; + return new_str; } /* * Mknod (create) a new object. * equiv_obj only has meaning for a hard link; - * aliasString only has meaning for a symlink. + * alias_str only has meaning for a symlink. * rdev only has meaning for devices (a subset of special objects) */ -static yaffs_obj_t *yaffs_create_obj(yaffs_obj_type type, - yaffs_obj_t *parent, +static struct yaffs_obj *yaffs_create_obj(enum yaffs_obj_type type, + struct yaffs_obj *parent, const YCHAR *name, - __u32 mode, - __u32 uid, - __u32 gid, - yaffs_obj_t *equiv_obj, - const YCHAR *aliasString, __u32 rdev) + u32 mode, + u32 uid, + u32 gid, + struct yaffs_obj *equiv_obj, + const YCHAR *alias_str, u32 rdev) { - yaffs_obj_t *in; + struct yaffs_obj *in; YCHAR *str = NULL; - yaffs_dev_t *dev = parent->my_dev; + 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.*/ if (yaffs_find_by_name(parent, name)) return NULL; if (type == YAFFS_OBJECT_TYPE_SYMLINK) { - str = yaffs_clone_str(aliasString); + str = yaffs_clone_str(alias_str); if (!str) return NULL; } @@ -1591,18 +1483,8 @@ static yaffs_obj_t *yaffs_create_obj(yaffs_obj_type type, in->yst_mode = mode; -#ifdef CONFIG_YAFFS_WINCE - yfsd_win_file_time_now(in->win_atime); - in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0]; - in->win_ctime[1] = in->win_mtime[1] = in->win_atime[1]; - -#else - in->yst_atime = in->yst_mtime = in->yst_ctime = Y_CURRENT_TIME; + yaffs_attribs_init(in, gid, uid, rdev); - in->yst_rdev = rdev; - in->yst_uid = uid; - in->yst_gid = gid; -#endif in->n_data_chunks = 0; yaffs_set_obj_name(in, name); @@ -1621,7 +1503,7 @@ static yaffs_obj_t *yaffs_create_obj(yaffs_obj_type type, equiv_obj; in->variant.hardlink_variant.equiv_id = equiv_obj->obj_id; - ylist_add(&in->hard_links, &equiv_obj->hard_links); + list_add(&in->hard_links, &equiv_obj->hard_links); break; case YAFFS_OBJECT_TYPE_FILE: case YAFFS_OBJECT_TYPE_DIRECTORY: @@ -1643,29 +1525,29 @@ static yaffs_obj_t *yaffs_create_obj(yaffs_obj_type type, return in; } -yaffs_obj_t *yaffs_create_file(yaffs_obj_t *parent, const YCHAR *name, - __u32 mode, __u32 uid, __u32 gid) +struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent, 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); } -yaffs_obj_t *yaffs_create_dir(yaffs_obj_t *parent, const YCHAR *name, - __u32 mode, __u32 uid, __u32 gid) +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, mode, uid, gid, NULL, NULL, 0); } -yaffs_obj_t *yaffs_create_special(yaffs_obj_t *parent, const YCHAR *name, - __u32 mode, __u32 uid, __u32 gid, __u32 rdev) +struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent, const YCHAR *name, + u32 mode, u32 uid, u32 gid, u32 rdev) { return yaffs_create_obj(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode, uid, gid, NULL, NULL, rdev); } -yaffs_obj_t *yaffs_create_symlink(yaffs_obj_t *parent, const YCHAR *name, - __u32 mode, __u32 uid, __u32 gid, +struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent, const YCHAR *name, + u32 mode, u32 uid, u32 gid, const YCHAR *alias) { return yaffs_create_obj(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode, @@ -1673,8 +1555,8 @@ yaffs_obj_t *yaffs_create_symlink(yaffs_obj_t *parent, const YCHAR *name, } /* yaffs_link_obj returns the object id of the equivalent object.*/ -yaffs_obj_t *yaffs_link_obj(yaffs_obj_t *parent, const YCHAR *name, - yaffs_obj_t *equiv_obj) +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 */ equiv_obj = yaffs_get_equivalent_obj(equiv_obj); @@ -1689,13 +1571,13 @@ yaffs_obj_t *yaffs_link_obj(yaffs_obj_t *parent, const YCHAR *name, } -static int yaffs_change_obj_name(yaffs_obj_t *obj, yaffs_obj_t *new_dir, +static int yaffs_change_obj_name(struct yaffs_obj *obj, struct yaffs_obj *new_dir, const YCHAR *new_name, int force, int shadows) { - int unlinkOp; - int deleteOp; + int unlink_op; + int del_op; - yaffs_obj_t *existingTarget; + struct yaffs_obj *existing_target; if (new_dir == NULL) new_dir = obj->parent; /* use the old directory */ @@ -1710,50 +1592,50 @@ static int yaffs_change_obj_name(yaffs_obj_t *obj, yaffs_obj_t *new_dir, /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */ if (obj->my_dev->param.is_yaffs2) - unlinkOp = (new_dir == obj->my_dev->unlinked_dir); + unlink_op = (new_dir == obj->my_dev->unlinked_dir); else - unlinkOp = (new_dir == obj->my_dev->unlinked_dir + unlink_op = (new_dir == obj->my_dev->unlinked_dir && obj->variant_type == YAFFS_OBJECT_TYPE_FILE); - deleteOp = (new_dir == obj->my_dev->del_dir); + del_op = (new_dir == obj->my_dev->del_dir); - existingTarget = yaffs_find_by_name(new_dir, new_name); + 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 * it into a directory. */ - if ((unlinkOp || - deleteOp || + if ((unlink_op || + del_op || force || (shadows > 0) || - !existingTarget) && + !existing_target) && new_dir->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) { yaffs_set_obj_name(obj, new_name); obj->dirty = 1; yaffs_add_obj_to_dir(new_dir, obj); - if (unlinkOp) + 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, deleteOp, shadows, NULL) >= 0) + if (yaffs_update_oh(obj, new_name, 0, del_op, shadows, NULL) >= 0) return YAFFS_OK; } return YAFFS_FAIL; } -int yaffs_rename_obj(yaffs_obj_t *old_dir, const YCHAR *old_name, - yaffs_obj_t *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) { - yaffs_obj_t *obj = NULL; - yaffs_obj_t *existingTarget = NULL; + struct yaffs_obj *obj = NULL; + struct yaffs_obj *existing_target = NULL; int force = 0; int result; - yaffs_dev_t *dev; + struct yaffs_dev *dev; if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) @@ -1764,7 +1646,7 @@ int yaffs_rename_obj(yaffs_obj_t *old_dir, const YCHAR *old_name, dev = old_dir->my_dev; #ifdef CONFIG_YAFFS_CASE_INSENSITIVE - /* Special case for case insemsitive systems (eg. WinCE). + /* Special case for case insemsitive systems. * While look-up is case insensitive, the name isn't. * Therefore we might want to change x.txt to X.txt */ @@ -1782,13 +1664,13 @@ int yaffs_rename_obj(yaffs_obj_t *old_dir, const YCHAR *old_name, /* Now do the handling for an existing target, if there is one */ - existingTarget = yaffs_find_by_name(new_dir, new_name); - if (existingTarget && - existingTarget->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY && - !ylist_empty(&existingTarget->variant.dir_variant.children)) { + existing_target = yaffs_find_by_name(new_dir, new_name); + if (existing_target && + existing_target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY && + !list_empty(&existing_target->variant.dir_variant.children)) { /* There is a target that is a non-empty directory, so we fail */ return YAFFS_FAIL; /* EEXIST or ENOTEMPTY */ - } else if (existingTarget && existingTarget != obj) { + } else if (existing_target && existing_target != obj) { /* Nuke the target first, using shadowing, * but only if it isn't the same object. * @@ -1797,9 +1679,9 @@ int yaffs_rename_obj(yaffs_obj_t *old_dir, const YCHAR *old_name, */ dev->gc_disable=1; yaffs_change_obj_name(obj, new_dir, new_name, force, - existingTarget->obj_id); - existingTarget->is_shadowed = 1; - yaffs_unlink_obj(existingTarget); + existing_target->obj_id); + existing_target->is_shadowed = 1; + yaffs_unlink_obj(existing_target); dev->gc_disable=0; } @@ -1816,9 +1698,9 @@ int yaffs_rename_obj(yaffs_obj_t *old_dir, const YCHAR *old_name, /*------------------------- Block Management and Page Allocation ----------------*/ -static int yaffs_init_blocks(yaffs_dev_t *dev) +static int yaffs_init_blocks(struct yaffs_dev *dev) { - int nBlocks = dev->internal_end_block - dev->internal_start_block + 1; + int n_blocks = dev->internal_end_block - dev->internal_start_block + 1; dev->block_info = NULL; dev->chunk_bits = NULL; @@ -1826,9 +1708,9 @@ static int yaffs_init_blocks(yaffs_dev_t *dev) dev->alloc_block = -1; /* force it to get a new one */ /* If the first allocation strategy fails, thry the alternate one */ - dev->block_info = YMALLOC(nBlocks * sizeof(yaffs_block_info_t)); + dev->block_info = YMALLOC(n_blocks * sizeof(struct yaffs_block_info)); if (!dev->block_info) { - dev->block_info = YMALLOC_ALT(nBlocks * sizeof(yaffs_block_info_t)); + dev->block_info = YMALLOC_ALT(n_blocks * sizeof(struct yaffs_block_info)); dev->block_info_alt = 1; } else dev->block_info_alt = 0; @@ -1836,24 +1718,24 @@ static int yaffs_init_blocks(yaffs_dev_t *dev) if (dev->block_info) { /* Set up dynamic blockinfo stuff. */ dev->chunk_bit_stride = (dev->param.chunks_per_block + 7) / 8; /* round up bytes */ - dev->chunk_bits = YMALLOC(dev->chunk_bit_stride * nBlocks); + dev->chunk_bits = YMALLOC(dev->chunk_bit_stride * n_blocks); if (!dev->chunk_bits) { - dev->chunk_bits = YMALLOC_ALT(dev->chunk_bit_stride * nBlocks); + dev->chunk_bits = YMALLOC_ALT(dev->chunk_bit_stride * n_blocks); dev->chunk_bits_alt = 1; } else dev->chunk_bits_alt = 0; } if (dev->block_info && dev->chunk_bits) { - memset(dev->block_info, 0, nBlocks * sizeof(yaffs_block_info_t)); - memset(dev->chunk_bits, 0, dev->chunk_bit_stride * nBlocks); + 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; } return YAFFS_FAIL; } -static void yaffs_deinit_blocks(yaffs_dev_t *dev) +static void yaffs_deinit_blocks(struct yaffs_dev *dev) { if (dev->block_info_alt && dev->block_info) YFREE_ALT(dev->block_info); @@ -1872,11 +1754,11 @@ static void yaffs_deinit_blocks(yaffs_dev_t *dev) dev->chunk_bits = NULL; } -void yaffs_block_became_dirty(yaffs_dev_t *dev, int block_no) +void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no) { - yaffs_block_info_t *bi = yaffs_get_block_info(dev, block_no); + struct yaffs_block_info *bi = yaffs_get_block_info(dev, block_no); - int erasedOk = 0; + int erased_ok = 0; /* If the block is still healthy erase it and mark as clean. * If the block has had a data failure, then retire it. @@ -1902,15 +1784,15 @@ void yaffs_block_became_dirty(yaffs_dev_t *dev, int block_no) if (!bi->needs_retiring) { yaffs2_checkpt_invalidate(dev); - erasedOk = yaffs_erase_block(dev, block_no); - if (!erasedOk) { + erased_ok = yaffs_erase_block(dev, block_no); + if (!erased_ok) { dev->n_erase_failures++; T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, (TSTR("**>> Erasure failed %d" TENDSTR), block_no)); } } - if (erasedOk && + if (erased_ok && ((yaffs_trace_mask & YAFFS_TRACE_ERASE) || !yaffs_skip_verification(dev))) { int i; for (i = 0; i < dev->param.chunks_per_block; i++) { @@ -1924,7 +1806,7 @@ void yaffs_block_became_dirty(yaffs_dev_t *dev, int block_no) } } - if (erasedOk) { + if (erased_ok) { /* Clean it up... */ bi->block_state = YAFFS_BLOCK_STATE_EMPTY; bi->seq_number = 0; @@ -1947,11 +1829,11 @@ void yaffs_block_became_dirty(yaffs_dev_t *dev, int block_no) } } -static int yaffs_find_alloc_block(yaffs_dev_t *dev) +static int yaffs_find_alloc_block(struct yaffs_dev *dev) { int i; - yaffs_block_info_t *bi; + struct yaffs_block_info *bi; if (dev->n_erased_blocks < 1) { /* Hoosterman we've got a problem. @@ -2000,24 +1882,24 @@ static int yaffs_find_alloc_block(yaffs_dev_t *dev) * Check if there's space to allocate... * Thinks.... do we need top make this ths same as yaffs_get_free_chunks()? */ -int yaffs_check_alloc_available(yaffs_dev_t *dev, int n_chunks) +int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks) { - int reservedChunks; - int reservedBlocks = dev->param.n_reserved_blocks; - int checkpointBlocks; + int reserved_chunks; + int reserved_blocks = dev->param.n_reserved_blocks; + int checkpt_blocks; - checkpointBlocks = yaffs_calc_checkpt_blocks_required(dev); + checkpt_blocks = yaffs_calc_checkpt_blocks_required(dev); - reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->param.chunks_per_block); + reserved_chunks = ((reserved_blocks + checkpt_blocks) * dev->param.chunks_per_block); - return (dev->n_free_chunks > (reservedChunks + n_chunks)); + return (dev->n_free_chunks > (reserved_chunks + n_chunks)); } -static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve, - yaffs_block_info_t **blockUsedPtr) +static int yaffs_alloc_chunk(struct yaffs_dev *dev, int use_reserver, + struct yaffs_block_info **block_ptr) { - int retVal; - yaffs_block_info_t *bi; + int ret_val; + struct yaffs_block_info *bi; if (dev->alloc_block < 0) { /* Get next block to allocate off */ @@ -2025,7 +1907,7 @@ static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve, dev->alloc_page = 0; } - if (!useReserve && !yaffs_check_alloc_available(dev, 1)) { + if (!use_reserver && !yaffs_check_alloc_available(dev, 1)) { /* Not enough space to allocate unless we're allowed to use the reserve. */ return -1; } @@ -2039,7 +1921,7 @@ static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve, if (dev->alloc_block >= 0) { bi = yaffs_get_block_info(dev, dev->alloc_block); - retVal = (dev->alloc_block * dev->param.chunks_per_block) + + ret_val = (dev->alloc_block * dev->param.chunks_per_block) + dev->alloc_page; bi->pages_in_use++; yaffs_set_chunk_bit(dev, dev->alloc_block, @@ -2055,10 +1937,10 @@ static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve, dev->alloc_block = -1; } - if (blockUsedPtr) - *blockUsedPtr = bi; + if (block_ptr) + *block_ptr = bi; - return retVal; + return ret_val; } T(YAFFS_TRACE_ERROR, @@ -2067,7 +1949,7 @@ static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve, return -1; } -static int yaffs_get_erased_chunks(yaffs_dev_t *dev) +static int yaffs_get_erased_chunks(struct yaffs_dev *dev) { int n; @@ -2084,10 +1966,10 @@ static int yaffs_get_erased_chunks(yaffs_dev_t *dev) * yaffs_skip_rest_of_block() skips over the rest of the allocation block * if we don't want to write to it. */ -void yaffs_skip_rest_of_block(yaffs_dev_t *dev) +void yaffs_skip_rest_of_block(struct yaffs_dev *dev) { if(dev->alloc_block > 0){ - yaffs_block_info_t *bi = yaffs_get_block_info(dev, dev->alloc_block); + struct yaffs_block_info *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; @@ -2096,36 +1978,36 @@ void yaffs_skip_rest_of_block(yaffs_dev_t *dev) } -static int yaffs_gc_block(yaffs_dev_t *dev, int block, - int wholeBlock) +static int yaffs_gc_block(struct yaffs_dev *dev, int block, + int whole_block) { - int oldChunk; - int newChunk; + int old_chunk; + int new_chunk; int mark_flash; - int retVal = YAFFS_OK; + int ret_val = YAFFS_OK; int i; - int isCheckpointBlock; - int matchingChunk; - int maxCopies; + int is_checkpt_block; + int matching_chunk; + int max_copies; - int chunksBefore = yaffs_get_erased_chunks(dev); - int chunksAfter; + int chunks_before = yaffs_get_erased_chunks(dev); + int chunks_after; - yaffs_ext_tags tags; + struct yaffs_ext_tags tags; - yaffs_block_info_t *bi = yaffs_get_block_info(dev, block); + struct yaffs_block_info *bi = yaffs_get_block_info(dev, block); - yaffs_obj_t *object; + struct yaffs_obj *object; - isCheckpointBlock = (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT); + is_checkpt_block = (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT); T(YAFFS_TRACE_TRACING, - (TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR), + (TSTR("Collecting block %d, in use %d, shrink %d, whole_block %d" TENDSTR), block, bi->pages_in_use, bi->has_shrink_hdr, - wholeBlock)); + whole_block)); /*yaffs_verify_free_chunks(dev); */ @@ -2136,7 +2018,7 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, dev->gc_disable = 1; - if (isCheckpointBlock || + if (is_checkpt_block || !yaffs_still_some_chunks(dev, block)) { T(YAFFS_TRACE_TRACING, (TSTR @@ -2145,30 +2027,30 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, yaffs_block_became_dirty(dev, block); } else { - __u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__); + u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__); yaffs_verify_blk(dev, bi, block); - maxCopies = (wholeBlock) ? dev->param.chunks_per_block : 5; - oldChunk = block * dev->param.chunks_per_block + dev->gc_chunk; + 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 */; - retVal == YAFFS_OK && + ret_val == YAFFS_OK && dev->gc_chunk < dev->param.chunks_per_block && (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) && - maxCopies > 0; - dev->gc_chunk++, oldChunk++) { + 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 */ - maxCopies--; + max_copies--; mark_flash = 1; yaffs_init_tags(&tags); - yaffs_rd_chunk_tags_nand(dev, oldChunk, + yaffs_rd_chunk_tags_nand(dev, old_chunk, buffer, &tags); object = @@ -2183,16 +2065,16 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, if (object && !yaffs_skip_verification(dev)) { if (tags.chunk_id == 0) - matchingChunk = object->hdr_chunk; + matching_chunk = object->hdr_chunk; else if (object->soft_del) - matchingChunk = oldChunk; /* Defeat the test */ + matching_chunk = old_chunk; /* Defeat the test */ else - matchingChunk = yaffs_find_chunk_in_file(object, tags.chunk_id, NULL); + matching_chunk = yaffs_find_chunk_in_file(object, tags.chunk_id, NULL); - if (oldChunk != matchingChunk) + if (old_chunk != matching_chunk) T(YAFFS_TRACE_ERROR, (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR), - oldChunk, matchingChunk, tags.obj_id, tags.chunk_id)); + old_chunk, matching_chunk, tags.obj_id, tags.chunk_id)); } @@ -2200,7 +2082,7 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, T(YAFFS_TRACE_ERROR, (TSTR ("page %d in gc has no object: %d %d %d " - TENDSTR), oldChunk, + TENDSTR), old_chunk, tags.obj_id, tags.chunk_id, tags.n_bytes)); } @@ -2257,12 +2139,12 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, /* It is an object Id, * We need to nuke the shrinkheader flags first * Also need to clean up shadowing. - * We no longer want the shrinkHeader flag since its work is done + * 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. */ - yaffs_obj_header *oh; - oh = (yaffs_obj_header *)buffer; + struct yaffs_obj_hdr *oh; + oh = (struct yaffs_obj_hdr *)buffer; oh->is_shrink = 0; tags.extra_is_shrink = 0; @@ -2278,21 +2160,21 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, } yaffs_verify_oh(object, oh, &tags, 1); - newChunk = - yaffs_write_new_chunk(dev,(__u8 *) oh, &tags, 1); + new_chunk = + yaffs_write_new_chunk(dev,(u8 *) oh, &tags, 1); } else - newChunk = + new_chunk = yaffs_write_new_chunk(dev, buffer, &tags, 1); - if (newChunk < 0) { - retVal = YAFFS_FAIL; + 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 = newChunk; + object->hdr_chunk = new_chunk; object->serial = tags.serial_number; } else { /* It's a data chunk */ @@ -2300,13 +2182,13 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, ok = yaffs_put_chunk_in_file (object, tags.chunk_id, - newChunk, 0); + new_chunk, 0); } } } - if (retVal == YAFFS_OK) - yaffs_chunk_del(dev, oldChunk, mark_flash, __LINE__); + if (ret_val == YAFFS_OK) + yaffs_chunk_del(dev, old_chunk, mark_flash, __LINE__); } } @@ -2351,12 +2233,12 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, } - chunksAfter = yaffs_get_erased_chunks(dev); - if (chunksBefore >= chunksAfter) { + chunks_after = yaffs_get_erased_chunks(dev); + if (chunks_before >= chunks_after) { T(YAFFS_TRACE_GC, (TSTR ("gc did not increase free chunks before %d after %d" - TENDSTR), chunksBefore, chunksAfter)); + TENDSTR), chunks_before, chunks_after)); } dev->gc_block = 0; dev->gc_chunk = 0; @@ -2365,7 +2247,7 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, dev->gc_disable = 0; - return retVal; + return ret_val; } /* @@ -2373,7 +2255,7 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block, * for garbage collection. */ -static unsigned yaffs_find_gc_block(yaffs_dev_t *dev, +static unsigned yaffs_find_gc_block(struct yaffs_dev *dev, int aggressive, int background) { @@ -2381,8 +2263,8 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev, int iterations; unsigned selected = 0; int prioritised = 0; - int prioritisedExists = 0; - yaffs_block_info_t *bi; + int prioritised_exist = 0; + struct yaffs_block_info *bi; int threshold; /* First let's see if we need to grab a prioritised block */ @@ -2394,7 +2276,7 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev, i++) { if (bi->gc_prioritise) { - prioritisedExists = 1; + prioritised_exist = 1; if (bi->block_state == YAFFS_BLOCK_STATE_FULL && yaffs_block_ok_for_gc(dev, bi)) { selected = i; @@ -2410,12 +2292,12 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev, * up the works. Let's gc the oldest dirty block. */ - if(prioritisedExists && + if(prioritised_exist && !selected && dev->oldest_dirty_block > 0) selected = dev->oldest_dirty_block; - if (!prioritisedExists) /* None found, so we can clear this */ + if (!prioritised_exist) /* None found, so we can clear this */ dev->has_pending_prioritised_gc = 0; } @@ -2426,30 +2308,30 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev, */ if (!selected){ - int pagesUsed; - int nBlocks = dev->internal_end_block - dev->internal_start_block + 1; + int pages_used; + int n_blocks = dev->internal_end_block - dev->internal_start_block + 1; if (aggressive){ threshold = dev->param.chunks_per_block; - iterations = nBlocks; + iterations = n_blocks; } else { - int maxThreshold; + int max_threshold; if(background) - maxThreshold = dev->param.chunks_per_block/2; + max_threshold = dev->param.chunks_per_block/2; else - maxThreshold = dev->param.chunks_per_block/8; + max_threshold = dev->param.chunks_per_block/8; - if(maxThreshold < YAFFS_GC_PASSIVE_THRESHOLD) - maxThreshold = YAFFS_GC_PASSIVE_THRESHOLD; + if(max_threshold < YAFFS_GC_PASSIVE_THRESHOLD) + max_threshold = YAFFS_GC_PASSIVE_THRESHOLD; threshold = background ? (dev->gc_not_done + 2) * 2 : 0; if(threshold maxThreshold) - threshold = maxThreshold; + if(threshold > max_threshold) + threshold = max_threshold; - iterations = nBlocks / 16 + 1; + iterations = n_blocks / 16 + 1; if (iterations > 100) iterations = 100; } @@ -2466,14 +2348,14 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev, bi = yaffs_get_block_info(dev, dev->gc_block_finder); - pagesUsed = bi->pages_in_use - bi->soft_del_pages; + pages_used = bi->pages_in_use - bi->soft_del_pages; if (bi->block_state == YAFFS_BLOCK_STATE_FULL && - pagesUsed < dev->param.chunks_per_block && - (dev->gc_dirtiest < 1 || pagesUsed < dev->gc_pages_in_use) && + 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 = dev->gc_block_finder; - dev->gc_pages_in_use = pagesUsed; + dev->gc_pages_in_use = pages_used; } } @@ -2538,14 +2420,14 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev, * The idea is to help clear out space in a more spread-out manner. * Dunno if it really does anything useful. */ -static int yaffs_check_gc(yaffs_dev_t *dev, int background) +static int yaffs_check_gc(struct yaffs_dev *dev, int background) { int aggressive = 0; - int gcOk = YAFFS_OK; - int maxTries = 0; - int minErased; - int erasedChunks; - int checkpointBlockAdjust; + int gc_ok = YAFFS_OK; + int max_tries = 0; + int min_erased; + int erased_chunks; + int checkpt_block_adjust; if(dev->param.gc_control && (dev->param.gc_control(dev) & 1) == 0) @@ -2561,23 +2443,23 @@ static int yaffs_check_gc(yaffs_dev_t *dev, int background) */ do { - maxTries++; + max_tries++; - checkpointBlockAdjust = yaffs_calc_checkpt_blocks_required(dev); + checkpt_block_adjust = yaffs_calc_checkpt_blocks_required(dev); - minErased = dev->param.n_reserved_blocks + checkpointBlockAdjust + 1; - erasedChunks = dev->n_erased_blocks * dev->param.chunks_per_block; + min_erased = dev->param.n_reserved_blocks + checkpt_block_adjust + 1; + erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block; /* If we need a block soon then do aggressive gc.*/ - if (dev->n_erased_blocks < minErased) + if (dev->n_erased_blocks < min_erased) aggressive = 1; else { - if(!background && erasedChunks > (dev->n_free_chunks / 4)) + if(!background && erased_chunks > (dev->n_free_chunks / 4)) break; if(dev->gc_skip > 20) dev->gc_skip = 20; - if(erasedChunks < dev->n_free_chunks/2 || + if(erased_chunks < dev->n_free_chunks/2 || dev->gc_skip < 1 || background) aggressive = 0; @@ -2609,23 +2491,23 @@ static int yaffs_check_gc(yaffs_dev_t *dev, int background) T(YAFFS_TRACE_GC, (TSTR - ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR), + ("yaffs: GC n_erased_blocks %d aggressive %d" TENDSTR), dev->n_erased_blocks, aggressive)); - gcOk = yaffs_gc_block(dev, dev->gc_block, aggressive); + gc_ok = yaffs_gc_block(dev, dev->gc_block, aggressive); } if (dev->n_erased_blocks < (dev->param.n_reserved_blocks) && dev->gc_block > 0) { T(YAFFS_TRACE_GC, (TSTR - ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d" - TENDSTR), dev->n_erased_blocks, maxTries, dev->gc_block)); + ("yaffs: GC !!!no reclaim!!! n_erased_blocks %d after try %d block %d" + TENDSTR), dev->n_erased_blocks, max_tries, dev->gc_block)); } } while ((dev->n_erased_blocks < dev->param.n_reserved_blocks) && (dev->gc_block > 0) && - (maxTries < 2)); + (max_tries < 2)); - return aggressive ? gcOk : YAFFS_OK; + return aggressive ? gc_ok : YAFFS_OK; } /* @@ -2633,22 +2515,22 @@ static int yaffs_check_gc(yaffs_dev_t *dev, int background) * Garbage collects. Intended to be called from a background thread. * Returns non-zero if at least half the free chunks are erased. */ -int yaffs_bg_gc(yaffs_dev_t *dev, unsigned urgency) +int yaffs_bg_gc(struct yaffs_dev *dev, unsigned urgency) { - int erasedChunks = dev->n_erased_blocks * dev->param.chunks_per_block; + int erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block; T(YAFFS_TRACE_BACKGROUND, (TSTR("Background gc %u" TENDSTR),urgency)); yaffs_check_gc(dev, 1); - return erasedChunks > dev->n_free_chunks/2; + return erased_chunks > dev->n_free_chunks/2; } /*------------------------- TAGS --------------------------------*/ -static int yaffs_tags_match(const yaffs_ext_tags *tags, int obj_id, - int chunkInObject) +static int yaffs_tags_match(const struct yaffs_ext_tags *tags, int obj_id, + int chunk_obj) { - return (tags->chunk_id == chunkInObject && + return (tags->chunk_id == chunk_obj && tags->obj_id == obj_id && !tags->is_deleted) ? 1 : 0; } @@ -2656,70 +2538,70 @@ static int yaffs_tags_match(const yaffs_ext_tags *tags, int obj_id, /*-------------------- Data file manipulation -----------------*/ -static int yaffs_find_chunk_in_file(yaffs_obj_t *in, int inode_chunk, - yaffs_ext_tags *tags) +static int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk, + struct yaffs_ext_tags *tags) { /*Get the Tnode, then get the level 0 offset chunk offset */ - yaffs_tnode_t *tn; - int theChunk = -1; - yaffs_ext_tags localTags; - int retVal = -1; + struct yaffs_tnode *tn; + int the_chunk = -1; + struct yaffs_ext_tags local_tags; + int ret_val = -1; - yaffs_dev_t *dev = in->my_dev; + struct yaffs_dev *dev = in->my_dev; if (!tags) { /* Passed a NULL, so use our own tags space */ - tags = &localTags; + tags = &local_tags; } tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk); if (tn) { - theChunk = yaffs_get_group_base(dev, tn, inode_chunk); + the_chunk = yaffs_get_group_base(dev, tn, inode_chunk); - retVal = - yaffs_find_chunk_in_group(dev, theChunk, tags, in->obj_id, + ret_val = + yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id, inode_chunk); } - return retVal; + return ret_val; } -static int yaffs_find_del_file_chunk(yaffs_obj_t *in, int inode_chunk, - yaffs_ext_tags *tags) +static int yaffs_find_del_file_chunk(struct yaffs_obj *in, int inode_chunk, + struct yaffs_ext_tags *tags) { /* Get the Tnode, then get the level 0 offset chunk offset */ - yaffs_tnode_t *tn; - int theChunk = -1; - yaffs_ext_tags localTags; + struct yaffs_tnode *tn; + int the_chunk = -1; + struct yaffs_ext_tags local_tags; - yaffs_dev_t *dev = in->my_dev; - int retVal = -1; + struct yaffs_dev *dev = in->my_dev; + int ret_val = -1; if (!tags) { /* Passed a NULL, so use our own tags space */ - tags = &localTags; + tags = &local_tags; } tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk); if (tn) { - theChunk = yaffs_get_group_base(dev, tn, inode_chunk); + the_chunk = yaffs_get_group_base(dev, tn, inode_chunk); - retVal = - yaffs_find_chunk_in_group(dev, theChunk, 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 (retVal != -1) + if (ret_val != -1) yaffs_load_tnode_0(dev, tn, inode_chunk, 0); } - return retVal; + return ret_val; } -int yaffs_put_chunk_in_file(yaffs_obj_t *in, int inode_chunk, +int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk, int nand_chunk, int in_scan) { /* NB in_scan is zero unless scanning. @@ -2729,12 +2611,12 @@ int yaffs_put_chunk_in_file(yaffs_obj_t *in, int inode_chunk, * nand_chunk = 0 is a dummy insert to make sure the tnodes are there. */ - yaffs_tnode_t *tn; - yaffs_dev_t *dev = in->my_dev; - int existingChunk; - yaffs_ext_tags existingTags; - yaffs_ext_tags newTags; - unsigned existingSerial, newSerial; + struct yaffs_tnode *tn; + struct yaffs_dev *dev = in->my_dev; + int existing_cunk; + struct yaffs_ext_tags existing_tags; + struct yaffs_ext_tags new_tags; + 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 @@ -2763,7 +2645,7 @@ int yaffs_put_chunk_in_file(yaffs_obj_t *in, int inode_chunk, /* Dummy insert, bail now */ return YAFFS_OK; - existingChunk = yaffs_get_group_base(dev, tn, inode_chunk); + existing_cunk = yaffs_get_group_base(dev, tn, inode_chunk); if (in_scan != 0) { /* If we're scanning then we need to test for duplicates @@ -2775,7 +2657,7 @@ int yaffs_put_chunk_in_file(yaffs_obj_t *in, int inode_chunk, * Update: For backward scanning we don't need to re-read tags so this is quite cheap. */ - if (existingChunk > 0) { + 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. * @@ -2790,15 +2672,15 @@ int yaffs_put_chunk_in_file(yaffs_obj_t *in, int inode_chunk, /* Only do this for forward scanning */ yaffs_rd_chunk_tags_nand(dev, nand_chunk, - NULL, &newTags); + NULL, &new_tags); /* Do a proper find */ - existingChunk = + existing_cunk = yaffs_find_chunk_in_file(in, inode_chunk, - &existingTags); + &existing_tags); } - if (existingChunk <= 0) { + if (existing_cunk <= 0) { /*Hoosterman - how did this happen? */ T(YAFFS_TRACE_ERROR, @@ -2813,18 +2695,18 @@ int yaffs_put_chunk_in_file(yaffs_obj_t *in, int inode_chunk, */ if (in_scan > 0) { - newSerial = newTags.serial_number; - existingSerial = existingTags.serial_number; + new_serial = new_tags.serial_number; + existing_serial = existing_tags.serial_number; } if ((in_scan > 0) && - (existingChunk <= 0 || - ((existingSerial + 1) & 3) == newSerial)) { + (existing_cunk <= 0 || + ((existing_serial + 1) & 3) == new_serial)) { /* Forward scanning. * Use new * Delete the old one and drop through to update the tnode */ - yaffs_chunk_del(dev, existingChunk, 1, + yaffs_chunk_del(dev, existing_cunk, 1, __LINE__); } else { /* Backward scanning or we want to use the existing one @@ -2839,7 +2721,7 @@ int yaffs_put_chunk_in_file(yaffs_obj_t *in, int inode_chunk, } - if (existingChunk == 0) + if (existing_cunk == 0) in->n_data_chunks++; yaffs_load_tnode_0(dev, tn, inode_chunk, nand_chunk); @@ -2847,8 +2729,8 @@ int yaffs_put_chunk_in_file(yaffs_obj_t *in, int inode_chunk, return YAFFS_OK; } -static int yaffs_rd_data_obj(yaffs_obj_t *in, int inode_chunk, - __u8 *buffer) +static int yaffs_rd_data_obj(struct yaffs_obj *in, int inode_chunk, + u8 *buffer) { int nand_chunk = yaffs_find_chunk_in_file(in, inode_chunk, NULL); @@ -2866,12 +2748,12 @@ static int yaffs_rd_data_obj(yaffs_obj_t *in, int inode_chunk, } -void yaffs_chunk_del(yaffs_dev_t *dev, int chunk_id, int mark_flash, int lyn) +void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash, int lyn) { int block; int page; - yaffs_ext_tags tags; - yaffs_block_info_t *bi; + struct yaffs_ext_tags tags; + struct yaffs_block_info *bi; if (chunk_id <= 0) return; @@ -2930,22 +2812,22 @@ void yaffs_chunk_del(yaffs_dev_t *dev, int chunk_id, int mark_flash, int lyn) } -static int yaffs_wr_data_obj(yaffs_obj_t *in, int inode_chunk, - const __u8 *buffer, int n_bytes, - int useReserve) +static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk, + 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. * Invalidate old tags. */ - int prevChunkId; - yaffs_ext_tags prevTags; + int prev_chunk_id; + struct yaffs_ext_tags prev_tags; - int newChunkId; - yaffs_ext_tags newTags; + int new_chunk_id; + struct yaffs_ext_tags new_tags; - yaffs_dev_t *dev = in->my_dev; + struct yaffs_dev *dev = in->my_dev; yaffs_check_gc(dev,0); @@ -2953,19 +2835,19 @@ static int yaffs_wr_data_obj(yaffs_obj_t *in, int inode_chunk, * If it does not exist then put a zero into the tree. This creates * the tnode now, rather than later when it is harder to clean up. */ - prevChunkId = yaffs_find_chunk_in_file(in, inode_chunk, &prevTags); - if(prevChunkId < 1 && + prev_chunk_id = yaffs_find_chunk_in_file(in, inode_chunk, &prev_tags); + if(prev_chunk_id < 1 && !yaffs_put_chunk_in_file(in, inode_chunk, 0, 0)) return 0; /* Set up new tags */ - yaffs_init_tags(&newTags); + yaffs_init_tags(&new_tags); - newTags.chunk_id = inode_chunk; - newTags.obj_id = in->obj_id; - newTags.serial_number = - (prevChunkId > 0) ? prevTags.serial_number + 1 : 1; - newTags.n_bytes = n_bytes; + new_tags.chunk_id = inode_chunk; + new_tags.obj_id = in->obj_id; + new_tags.serial_number = + (prev_chunk_id > 0) ? prev_tags.serial_number + 1 : 1; + new_tags.n_bytes = n_bytes; if (n_bytes < 1 || n_bytes > dev->param.total_bytes_per_chunk) { T(YAFFS_TRACE_ERROR, @@ -2974,46 +2856,46 @@ static int yaffs_wr_data_obj(yaffs_obj_t *in, int inode_chunk, } - newChunkId = - yaffs_write_new_chunk(dev, buffer, &newTags, - useReserve); + new_chunk_id = + yaffs_write_new_chunk(dev, buffer, &new_tags, + use_reserve); - if (newChunkId > 0) { - yaffs_put_chunk_in_file(in, inode_chunk, newChunkId, 0); + if (new_chunk_id > 0) { + yaffs_put_chunk_in_file(in, inode_chunk, new_chunk_id, 0); - if (prevChunkId > 0) - yaffs_chunk_del(dev, prevChunkId, 1, __LINE__); + if (prev_chunk_id > 0) + yaffs_chunk_del(dev, prev_chunk_id, 1, __LINE__); yaffs_verify_file_sane(in); } - return newChunkId; + return new_chunk_id; } /* UpdateObjectHeader updates the header on NAND for an object. * If name is not NULL, then that new name is used. */ -int yaffs_update_oh(yaffs_obj_t *in, const YCHAR *name, int force, - int is_shrink, int shadows, yaffs_xattr_mod *xmod) +int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force, + int is_shrink, int shadows, struct yaffs_xattr_mod *xmod) { - yaffs_block_info_t *bi; + struct yaffs_block_info *bi; - yaffs_dev_t *dev = in->my_dev; + struct yaffs_dev *dev = in->my_dev; - int prevChunkId; - int retVal = 0; + int prev_chunk_id; + int ret_val = 0; int result = 0; - int newChunkId; - yaffs_ext_tags newTags; - yaffs_ext_tags oldTags; + int new_chunk_id; + struct yaffs_ext_tags new_tags; + struct yaffs_ext_tags old_tags; const YCHAR *alias = NULL; - __u8 *buffer = NULL; + u8 *buffer = NULL; YCHAR old_name[YAFFS_MAX_NAME_LENGTH + 1]; - yaffs_obj_header *oh = NULL; + struct yaffs_obj_hdr *oh = NULL; yaffs_strcpy(old_name, _Y("silly old name")); @@ -3026,18 +2908,18 @@ int yaffs_update_oh(yaffs_obj_t *in, const YCHAR *name, int force, yaffs_check_obj_details_loaded(in); buffer = yaffs_get_temp_buffer(in->my_dev, __LINE__); - oh = (yaffs_obj_header *) buffer; + oh = (struct yaffs_obj_hdr *) buffer; - prevChunkId = in->hdr_chunk; + prev_chunk_id = in->hdr_chunk; - if (prevChunkId > 0) { - result = yaffs_rd_chunk_tags_nand(dev, prevChunkId, - buffer, &oldTags); + if (prev_chunk_id > 0) { + result = yaffs_rd_chunk_tags_nand(dev, prev_chunk_id, + buffer, &old_tags); - yaffs_verify_oh(in, oh, &oldTags, 0); + yaffs_verify_oh(in, oh, &old_tags, 0); memcpy(old_name, oh->name, sizeof(oh->name)); - memset(buffer, 0xFF, sizeof(yaffs_obj_header)); + memset(buffer, 0xFF, sizeof(struct yaffs_obj_hdr)); } else memset(buffer, 0xFF, dev->data_bytes_per_chunk); @@ -3045,21 +2927,8 @@ int yaffs_update_oh(yaffs_obj_t *in, const YCHAR *name, int force, oh->yst_mode = in->yst_mode; oh->shadows_obj = oh->inband_shadowed_obj_id = shadows; -#ifdef CONFIG_YAFFS_WINCE - oh->win_atime[0] = in->win_atime[0]; - oh->win_ctime[0] = in->win_ctime[0]; - oh->win_mtime[0] = in->win_mtime[0]; - oh->win_atime[1] = in->win_atime[1]; - oh->win_ctime[1] = in->win_ctime[1]; - oh->win_mtime[1] = in->win_mtime[1]; -#else - oh->yst_uid = in->yst_uid; - oh->yst_gid = in->yst_gid; - oh->yst_atime = in->yst_atime; - oh->yst_mtime = in->yst_mtime; - oh->yst_ctime = in->yst_ctime; - oh->yst_rdev = in->yst_rdev; -#endif + yaffs_load_attribs_oh(oh,in); + if (in->parent) oh->parent_obj_id = in->parent->obj_id; else @@ -3068,7 +2937,7 @@ int yaffs_update_oh(yaffs_obj_t *in, const YCHAR *name, int force, if (name && *name) { memset(oh->name, 0, sizeof(oh->name)); yaffs_load_oh_from_name(dev,oh->name,name); - } else if (prevChunkId > 0) + } else if (prev_chunk_id > 0) memcpy(oh->name, old_name, sizeof(oh->name)); else memset(oh->name, 0, sizeof(oh->name)); @@ -3113,35 +2982,35 @@ int yaffs_update_oh(yaffs_obj_t *in, const YCHAR *name, int force, /* Tags */ - yaffs_init_tags(&newTags); + yaffs_init_tags(&new_tags); in->serial++; - newTags.chunk_id = 0; - newTags.obj_id = in->obj_id; - newTags.serial_number = 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 */ - newTags.extra_available = 1; - newTags.extra_parent_id = oh->parent_obj_id; - newTags.extra_length = oh->file_size; - newTags.extra_is_shrink = oh->is_shrink; - newTags.extra_equiv_id = oh->equiv_id; - newTags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0; - newTags.extra_obj_type = in->variant_type; + 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, &newTags, 1); + yaffs_verify_oh(in, oh, &new_tags, 1); /* Create new chunk in NAND */ - newChunkId = - yaffs_write_new_chunk(dev, buffer, &newTags, - (prevChunkId > 0) ? 1 : 0); + new_chunk_id = + yaffs_write_new_chunk(dev, buffer, &new_tags, + (prev_chunk_id > 0) ? 1 : 0); - if (newChunkId >= 0) { + if (new_chunk_id >= 0) { - in->hdr_chunk = newChunkId; + in->hdr_chunk = new_chunk_id; - if (prevChunkId > 0) { - yaffs_chunk_del(dev, prevChunkId, 1, + if (prev_chunk_id > 0) { + yaffs_chunk_del(dev, prev_chunk_id, 1, __LINE__); } @@ -3151,43 +3020,43 @@ int yaffs_update_oh(yaffs_obj_t *in, const YCHAR *name, int force, /* 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, - newChunkId / in->my_dev->param.chunks_per_block); + new_chunk_id / in->my_dev->param.chunks_per_block); bi->has_shrink_hdr = 1; } } - retVal = newChunkId; + ret_val = new_chunk_id; } if (buffer) yaffs_release_temp_buffer(dev, buffer, __LINE__); - return retVal; + return ret_val; } /*------------------------ Short Operations Cache ---------------------------------------- - * In many situations where there is no high level buffering (eg WinCE) a lot of + * 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 aand the short op cache provides write - * buffering. + * 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 + * provides write buffering. * * There are a limited number (~10) of cache chunks per device so that we don't * need a very intelligent search. */ -static int yaffs_obj_cache_dirty(yaffs_obj_t *obj) +static int yaffs_obj_cache_dirty(struct yaffs_obj *obj) { - yaffs_dev_t *dev = obj->my_dev; + struct yaffs_dev *dev = obj->my_dev; int i; - yaffs_cache_t *cache; - int nCaches = obj->my_dev->param.n_caches; + struct yaffs_cache *cache; + int n_caches = obj->my_dev->param.n_caches; - for (i = 0; i < nCaches; i++) { + for (i = 0; i < n_caches; i++) { cache = &dev->cache[i]; if (cache->object == obj && cache->dirty) @@ -3198,21 +3067,21 @@ static int yaffs_obj_cache_dirty(yaffs_obj_t *obj) } -static void yaffs_flush_file_cache(yaffs_obj_t *obj) +static void yaffs_flush_file_cache(struct yaffs_obj *obj) { - yaffs_dev_t *dev = obj->my_dev; + struct yaffs_dev *dev = obj->my_dev; int lowest = -99; /* Stop compiler whining. */ int i; - yaffs_cache_t *cache; - int chunkWritten = 0; - int nCaches = obj->my_dev->param.n_caches; + struct yaffs_cache *cache; + int chunk_written = 0; + int n_caches = obj->my_dev->param.n_caches; - if (nCaches > 0) { + if (n_caches > 0) { do { cache = NULL; /* Find the dirty cache for this object with the lowest chunk id. */ - for (i = 0; i < nCaches; i++) { + for (i = 0; i < n_caches; i++) { if (dev->cache[i].object == obj && dev->cache[i].dirty) { if (!cache @@ -3227,7 +3096,7 @@ static void yaffs_flush_file_cache(yaffs_obj_t *obj) if (cache && !cache->locked) { /* Write it out and free it up */ - chunkWritten = + chunk_written = yaffs_wr_data_obj(cache->object, cache->chunk_id, cache->data, @@ -3237,7 +3106,7 @@ static void yaffs_flush_file_cache(yaffs_obj_t *obj) cache->object = NULL; } - } while (cache && chunkWritten > 0); + } while (cache && chunk_written > 0); if (cache) { /* Hoosterman, disk full while writing cache out. */ @@ -3254,10 +3123,10 @@ static void yaffs_flush_file_cache(yaffs_obj_t *obj) * */ -void yaffs_flush_whole_cache(yaffs_dev_t *dev) +void yaffs_flush_whole_cache(struct yaffs_dev *dev) { - yaffs_obj_t *obj; - int nCaches = dev->param.n_caches; + struct yaffs_obj *obj; + int n_caches = dev->param.n_caches; int i; /* Find a dirty object in the cache and flush it... @@ -3265,7 +3134,7 @@ void yaffs_flush_whole_cache(yaffs_dev_t *dev) */ do { obj = NULL; - for (i = 0; i < nCaches && !obj; i++) { + for (i = 0; i < n_caches && !obj; i++) { if (dev->cache[i].object && dev->cache[i].dirty) obj = dev->cache[i].object; @@ -3284,7 +3153,7 @@ void yaffs_flush_whole_cache(yaffs_dev_t *dev) * Then look for the least recently used non-dirty one. * Then look for the least recently used dirty one...., flush and look again. */ -static yaffs_cache_t *yaffs_grab_chunk_worker(yaffs_dev_t *dev) +static struct yaffs_cache *yaffs_grab_chunk_worker(struct yaffs_dev *dev) { int i; @@ -3298,10 +3167,10 @@ static yaffs_cache_t *yaffs_grab_chunk_worker(yaffs_dev_t *dev) return NULL; } -static yaffs_cache_t *yaffs_grab_chunk_cache(yaffs_dev_t *dev) +static struct yaffs_cache *yaffs_grab_chunk_cache(struct yaffs_dev *dev) { - yaffs_cache_t *cache; - yaffs_obj_t *theObj; + struct yaffs_cache *cache; + struct yaffs_obj *the_obj; int usage; int i; int pushout; @@ -3320,7 +3189,7 @@ static yaffs_cache_t *yaffs_grab_chunk_cache(yaffs_dev_t *dev) /* With locking we can't assume we can use entry zero */ - theObj = NULL; + the_obj = NULL; usage = -1; cache = NULL; pushout = -1; @@ -3330,7 +3199,7 @@ static yaffs_cache_t *yaffs_grab_chunk_cache(yaffs_dev_t *dev) !dev->cache[i].locked && (dev->cache[i].last_use < usage || !cache)) { usage = dev->cache[i].last_use; - theObj = dev->cache[i].object; + the_obj = dev->cache[i].object; cache = &dev->cache[i]; pushout = i; } @@ -3338,7 +3207,7 @@ static yaffs_cache_t *yaffs_grab_chunk_cache(yaffs_dev_t *dev) if (!cache || cache->dirty) { /* Flush and try again */ - yaffs_flush_file_cache(theObj); + yaffs_flush_file_cache(the_obj); cache = yaffs_grab_chunk_worker(dev); } @@ -3350,10 +3219,10 @@ static yaffs_cache_t *yaffs_grab_chunk_cache(yaffs_dev_t *dev) } /* Find a cached chunk */ -static yaffs_cache_t *yaffs_find_chunk_cache(const yaffs_obj_t *obj, +static struct yaffs_cache *yaffs_find_chunk_cache(const struct yaffs_obj *obj, int chunk_id) { - yaffs_dev_t *dev = obj->my_dev; + struct yaffs_dev *dev = obj->my_dev; int i; if (dev->param.n_caches > 0) { for (i = 0; i < dev->param.n_caches; i++) { @@ -3369,8 +3238,8 @@ static yaffs_cache_t *yaffs_find_chunk_cache(const yaffs_obj_t *obj, } /* Mark the chunk for the least recently used algorithym */ -static void yaffs_use_cache(yaffs_dev_t *dev, yaffs_cache_t *cache, - int isAWrite) +static void yaffs_use_cache(struct yaffs_dev *dev, struct yaffs_cache *cache, + int is_write) { if (dev->param.n_caches > 0) { @@ -3387,7 +3256,7 @@ static void yaffs_use_cache(yaffs_dev_t *dev, yaffs_cache_t *cache, cache->last_use = dev->cache_last_use; - if (isAWrite) + if (is_write) cache->dirty = 1; } } @@ -3396,10 +3265,10 @@ static void yaffs_use_cache(yaffs_dev_t *dev, yaffs_cache_t *cache, * Do this when a whole page gets written, * ie the short cache for this page is no longer valid. */ -static void yaffs_invalidate_chunk_cache(yaffs_obj_t *object, int chunk_id) +static void yaffs_invalidate_chunk_cache(struct yaffs_obj *object, int chunk_id) { if (object->my_dev->param.n_caches > 0) { - yaffs_cache_t *cache = yaffs_find_chunk_cache(object, chunk_id); + struct yaffs_cache *cache = yaffs_find_chunk_cache(object, chunk_id); if (cache) cache->object = NULL; @@ -3409,10 +3278,10 @@ static void yaffs_invalidate_chunk_cache(yaffs_obj_t *object, int chunk_id) /* Invalidate all the cache pages associated with this object * Do this whenever ther file is deleted or resized. */ -static void yaffs_invalidate_whole_cache(yaffs_obj_t *in) +static void yaffs_invalidate_whole_cache(struct yaffs_obj *in) { int i; - yaffs_dev_t *dev = in->my_dev; + struct yaffs_dev *dev = in->my_dev; if (dev->param.n_caches > 0) { /* Invalidate it. */ @@ -3434,18 +3303,18 @@ static void yaffs_invalidate_whole_cache(yaffs_obj_t *in) * Curve-balls: the first chunk might also be the last chunk. */ -int yaffs_file_rd(yaffs_obj_t *in, __u8 *buffer, loff_t offset, +int yaffs_file_rd(struct yaffs_obj *in, u8 *buffer, loff_t offset, int n_bytes) { int chunk; - __u32 start; - int nToCopy; + u32 start; + int n_copy; int n = n_bytes; - int nDone = 0; - yaffs_cache_t *cache; + int n_done = 0; + struct yaffs_cache *cache; - yaffs_dev_t *dev; + struct yaffs_dev *dev; dev = in->my_dev; @@ -3459,9 +3328,9 @@ int yaffs_file_rd(yaffs_obj_t *in, __u8 *buffer, loff_t offset, * the same chunk. */ if ((start + n) < dev->data_bytes_per_chunk) - nToCopy = n; + n_copy = n; else - nToCopy = dev->data_bytes_per_chunk - start; + n_copy = dev->data_bytes_per_chunk - start; cache = yaffs_find_chunk_cache(in, chunk); @@ -3469,7 +3338,7 @@ int yaffs_file_rd(yaffs_obj_t *in, __u8 *buffer, loff_t offset, * or we're using inband tags then use the cache (if there is caching) * else bypass the cache. */ - if (cache || nToCopy != 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. */ @@ -3491,21 +3360,21 @@ int yaffs_file_rd(yaffs_obj_t *in, __u8 *buffer, loff_t offset, cache->locked = 1; - memcpy(buffer, &cache->data[start], nToCopy); + memcpy(buffer, &cache->data[start], n_copy); cache->locked = 0; } else { /* Read into the local buffer then copy..*/ - __u8 *localBuffer = + u8 *local_buffer = yaffs_get_temp_buffer(dev, __LINE__); yaffs_rd_data_obj(in, chunk, - localBuffer); + local_buffer); - memcpy(buffer, &localBuffer[start], nToCopy); + memcpy(buffer, &local_buffer[start], n_copy); - yaffs_release_temp_buffer(dev, localBuffer, + yaffs_release_temp_buffer(dev, local_buffer, __LINE__); } @@ -3516,36 +3385,36 @@ int yaffs_file_rd(yaffs_obj_t *in, __u8 *buffer, loff_t offset, } - n -= nToCopy; - offset += nToCopy; - buffer += nToCopy; - nDone += nToCopy; + n -= n_copy; + offset += n_copy; + buffer += n_copy; + n_done += n_copy; } - return nDone; + return n_done; } -int yaffs_do_file_wr(yaffs_obj_t *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) { int chunk; - __u32 start; - int nToCopy; + u32 start; + int n_copy; int n = n_bytes; - int nDone = 0; - int nToWriteBack; - int startOfWrite = offset; - int chunkWritten = 0; - __u32 n_bytesRead; - __u32 chunkStart; + int n_done = 0; + int n_writeback; + int start_write = offset; + int chunk_written = 0; + u32 n_bytes_read; + u32 chunk_start; - yaffs_dev_t *dev; + struct yaffs_dev *dev; dev = in->my_dev; - while (n > 0 && chunkWritten >= 0) { + while (n > 0 && chunk_written >= 0) { yaffs_addr_to_chunk(dev, offset, &chunk, &start); if (chunk * dev->data_bytes_per_chunk + start != offset || @@ -3562,41 +3431,41 @@ int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset, */ if ((start + n) < dev->data_bytes_per_chunk) { - nToCopy = n; + 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. */ - chunkStart = ((chunk - 1) * dev->data_bytes_per_chunk); + chunk_start = ((chunk - 1) * dev->data_bytes_per_chunk); - if (chunkStart > in->variant.file_variant.file_size) - n_bytesRead = 0; /* Past end of file */ + if (chunk_start > in->variant.file_variant.file_size) + n_bytes_read = 0; /* Past end of file */ else - n_bytesRead = in->variant.file_variant.file_size - chunkStart; + n_bytes_read = in->variant.file_variant.file_size - chunk_start; - if (n_bytesRead > dev->data_bytes_per_chunk) - n_bytesRead = dev->data_bytes_per_chunk; + if (n_bytes_read > dev->data_bytes_per_chunk) + n_bytes_read = dev->data_bytes_per_chunk; - nToWriteBack = - (n_bytesRead > - (start + n)) ? n_bytesRead : (start + n); + n_writeback = + (n_bytes_read > + (start + n)) ? n_bytes_read : (start + n); - if (nToWriteBack < 0 || nToWriteBack > dev->data_bytes_per_chunk) + if (n_writeback < 0 || n_writeback > dev->data_bytes_per_chunk) YBUG(); } else { - nToCopy = dev->data_bytes_per_chunk - start; - nToWriteBack = dev->data_bytes_per_chunk; + n_copy = dev->data_bytes_per_chunk - start; + n_writeback = dev->data_bytes_per_chunk; } - if (nToCopy != dev->data_bytes_per_chunk || dev->param.inband_tags) { + 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) { - yaffs_cache_t *cache; + struct yaffs_cache *cache; /* If we can't find the data in the cache, then load the cache */ cache = yaffs_find_chunk_cache(in, chunk); @@ -3624,14 +3493,14 @@ int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset, memcpy(&cache->data[start], buffer, - nToCopy); + n_copy); cache->locked = 0; - cache->n_bytes = nToWriteBack; + cache->n_bytes = n_writeback; if (write_trhrough) { - chunkWritten = + chunk_written = yaffs_wr_data_obj (cache->object, cache->chunk_id, @@ -3641,30 +3510,30 @@ int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset, } } else { - chunkWritten = -1; /* fail the write */ + chunk_written = -1; /* fail the 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. */ - __u8 *localBuffer = + u8 *local_buffer = yaffs_get_temp_buffer(dev, __LINE__); yaffs_rd_data_obj(in, chunk, - localBuffer); + local_buffer); - memcpy(&localBuffer[start], buffer, nToCopy); + memcpy(&local_buffer[start], buffer, n_copy); - chunkWritten = + chunk_written = yaffs_wr_data_obj(in, chunk, - localBuffer, - nToWriteBack, + local_buffer, + n_writeback, 0); - yaffs_release_temp_buffer(dev, localBuffer, + yaffs_release_temp_buffer(dev, local_buffer, __LINE__); } @@ -3674,7 +3543,7 @@ int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset, - chunkWritten = + chunk_written = yaffs_wr_data_obj(in, chunk, buffer, dev->data_bytes_per_chunk, 0); @@ -3683,26 +3552,26 @@ int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset, yaffs_invalidate_chunk_cache(in, chunk); } - if (chunkWritten >= 0) { - n -= nToCopy; - offset += nToCopy; - buffer += nToCopy; - nDone += nToCopy; + if (chunk_written >= 0) { + n -= n_copy; + offset += n_copy; + buffer += n_copy; + n_done += n_copy; } } /* Update file object */ - if ((startOfWrite + nDone) > in->variant.file_variant.file_size) - in->variant.file_variant.file_size = (startOfWrite + nDone); + if ((start_write + n_done) > in->variant.file_variant.file_size) + in->variant.file_variant.file_size = (start_write + n_done); in->dirty = 1; - return nDone; + return n_done; } -int yaffs_wr_file(yaffs_obj_t *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); @@ -3713,15 +3582,15 @@ int yaffs_wr_file(yaffs_obj_t *in, const __u8 *buffer, loff_t offset, /* ---------------------- File resizing stuff ------------------ */ -static void yaffs_prune_chunks(yaffs_obj_t *in, int new_size) +static void yaffs_prune_chunks(struct yaffs_obj *in, int new_size) { - yaffs_dev_t *dev = in->my_dev; - int oldFileSize = in->variant.file_variant.file_size; + struct yaffs_dev *dev = in->my_dev; + int old_size = in->variant.file_variant.file_size; - int lastDel = 1 + (oldFileSize - 1) / dev->data_bytes_per_chunk; + int last_del = 1 + (old_size - 1) / dev->data_bytes_per_chunk; - int startDel = 1 + (new_size + dev->data_bytes_per_chunk - 1) / + int start_del = 1 + (new_size + dev->data_bytes_per_chunk - 1) / dev->data_bytes_per_chunk; int i; int chunk_id; @@ -3729,7 +3598,7 @@ static void yaffs_prune_chunks(yaffs_obj_t *in, int new_size) /* Delete backwards so that we don't end up with holes if * power is lost part-way through the operation. */ - for (i = lastDel; i >= startDel; i--) { + for (i = last_del; i >= start_del; i--) { /* NB this could be optimised somewhat, * eg. could retrieve the tags and write them without * using yaffs_chunk_del @@ -3755,29 +3624,29 @@ static void yaffs_prune_chunks(yaffs_obj_t *in, int new_size) } -void yaffs_resize_file_down( yaffs_obj_t *obj, loff_t new_size) +void yaffs_resize_file_down( struct yaffs_obj *obj, loff_t new_size) { - int newFullChunks; - __u32 new_sizeOfPartialChunk; - yaffs_dev_t *dev = obj->my_dev; + int new_full; + u32 new_partial; + struct yaffs_dev *dev = obj->my_dev; - yaffs_addr_to_chunk(dev, new_size, &newFullChunks, &new_sizeOfPartialChunk); + yaffs_addr_to_chunk(dev, new_size, &new_full, &new_partial); yaffs_prune_chunks(obj, new_size); - if (new_sizeOfPartialChunk != 0) { - int lastChunk = 1 + newFullChunks; - __u8 *localBuffer = yaffs_get_temp_buffer(dev, __LINE__); + if (new_partial != 0) { + int last_chunk = 1 + new_full; + u8 *local_buffer = yaffs_get_temp_buffer(dev, __LINE__); /* Got to read and rewrite the last chunk with its new size and zero pad */ - yaffs_rd_data_obj(obj, lastChunk, localBuffer); - memset(localBuffer + new_sizeOfPartialChunk, 0, - dev->data_bytes_per_chunk - new_sizeOfPartialChunk); + yaffs_rd_data_obj(obj, last_chunk, local_buffer); + memset(local_buffer + new_partial, 0, + dev->data_bytes_per_chunk - new_partial); - yaffs_wr_data_obj(obj, lastChunk, localBuffer, - new_sizeOfPartialChunk, 1); + yaffs_wr_data_obj(obj, last_chunk, local_buffer, + new_partial, 1); - yaffs_release_temp_buffer(dev, localBuffer, __LINE__); + yaffs_release_temp_buffer(dev, local_buffer, __LINE__); } obj->variant.file_variant.file_size = new_size; @@ -3786,10 +3655,10 @@ void yaffs_resize_file_down( yaffs_obj_t *obj, loff_t new_size) } -int yaffs_resize_file(yaffs_obj_t *in, loff_t new_size) +int yaffs_resize_file(struct yaffs_obj *in, loff_t new_size) { - yaffs_dev_t *dev = in->my_dev; - int oldFileSize = in->variant.file_variant.file_size; + struct yaffs_dev *dev = in->my_dev; + int old_size = in->variant.file_variant.file_size; yaffs_flush_file_cache(in); yaffs_invalidate_whole_cache(in); @@ -3799,14 +3668,14 @@ int yaffs_resize_file(yaffs_obj_t *in, loff_t new_size) if (in->variant_type != YAFFS_OBJECT_TYPE_FILE) return YAFFS_FAIL; - if (new_size == oldFileSize) + if (new_size == old_size) return YAFFS_OK; - if(new_size > oldFileSize){ + if(new_size > old_size){ yaffs2_handle_hole(in,new_size); in->variant.file_variant.file_size = new_size; } else { - /* new_size < oldFileSize */ + /* new_size < old_size */ yaffs_resize_file_down(in, new_size); } @@ -3825,56 +3694,30 @@ int yaffs_resize_file(yaffs_obj_t *in, loff_t new_size) return YAFFS_OK; } -loff_t yaffs_get_file_size(yaffs_obj_t *obj) -{ - YCHAR *alias = NULL; - obj = yaffs_get_equivalent_obj(obj); - - switch (obj->variant_type) { - case YAFFS_OBJECT_TYPE_FILE: - return obj->variant.file_variant.file_size; - case YAFFS_OBJECT_TYPE_SYMLINK: - alias = obj->variant.symlink_variant.alias; - if(!alias) - return 0; - return yaffs_strnlen(alias,YAFFS_MAX_ALIAS_LENGTH); - default: - return 0; - } -} - - -int yaffs_flush_file(yaffs_obj_t *in, int update_time, int data_sync) +int yaffs_flush_file(struct yaffs_obj *in, int update_time, int data_sync) { - int retVal; + int ret_val; if (in->dirty) { yaffs_flush_file_cache(in); if(data_sync) /* Only sync data */ - retVal=YAFFS_OK; + ret_val=YAFFS_OK; else { - if (update_time) { -#ifdef CONFIG_YAFFS_WINCE - yfsd_win_file_time_now(in->win_mtime); -#else + if (update_time) + yaffs_load_current_time(in,0,0); - in->yst_mtime = Y_CURRENT_TIME; - -#endif - } - - retVal = (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >= + ret_val = (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >= 0) ? YAFFS_OK : YAFFS_FAIL; } } else { - retVal = YAFFS_OK; + ret_val = YAFFS_OK; } - return retVal; + return ret_val; } -static int yaffs_generic_obj_del(yaffs_obj_t *in) +static int yaffs_generic_obj_del(struct yaffs_obj *in) { /* First off, invalidate the file's data in the cache, without flushing. */ @@ -3899,18 +3742,18 @@ static int yaffs_generic_obj_del(yaffs_obj_t *in) * and the inode associated with the file. * It does not delete the links associated with the file. */ -static int yaffs_unlink_file_if_needed(yaffs_obj_t *in) +static int yaffs_unlink_file_if_needed(struct yaffs_obj *in) { - int retVal; - int immediateDeletion = 0; - yaffs_dev_t *dev = in->my_dev; + int ret_val; + int del_now = 0; + struct yaffs_dev *dev = in->my_dev; if (!in->my_inode) - immediateDeletion = 1; + del_now = 1; - if (immediateDeletion) { - retVal = + if (del_now) { + ret_val = yaffs_change_obj_name(in, in->my_dev->del_dir, _Y("deleted"), 0, 0); T(YAFFS_TRACE_TRACING, @@ -3922,20 +3765,20 @@ static int yaffs_unlink_file_if_needed(yaffs_obj_t *in) yaffs_resize_file(in, 0); yaffs_soft_del_file(in); } else { - retVal = + ret_val = yaffs_change_obj_name(in, in->my_dev->unlinked_dir, _Y("unlinked"), 0, 0); } - return retVal; + return ret_val; } -int yaffs_del_file(yaffs_obj_t *in) +int yaffs_del_file(struct yaffs_obj *in) { - int retVal = YAFFS_OK; + int ret_val = YAFFS_OK; int deleted; /* Need to cache value on stack if in is freed */ - yaffs_dev_t *dev = in->my_dev; + struct yaffs_dev *dev = in->my_dev; if (dev->param.disable_soft_del || dev->param.is_yaffs2) yaffs_resize_file(in, 0); @@ -3945,11 +3788,11 @@ int yaffs_del_file(yaffs_obj_t *in) * That won't be the case if it has been resized to zero. */ if (!in->unlinked) - retVal = yaffs_unlink_file_if_needed(in); + ret_val = yaffs_unlink_file_if_needed(in); deleted = in->deleted; - if (retVal == YAFFS_OK && in->unlinked && !in->deleted) { + if (ret_val == YAFFS_OK && in->unlinked && !in->deleted) { in->deleted = 1; deleted = 1; in->my_dev->n_deleted_files++; @@ -3966,13 +3809,13 @@ int yaffs_del_file(yaffs_obj_t *in) } } -static int yaffs_is_non_empty_dir(yaffs_obj_t *obj) +static int yaffs_is_non_empty_dir(struct yaffs_obj *obj) { return (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) && - !(ylist_empty(&obj->variant.dir_variant.children)); + !(list_empty(&obj->variant.dir_variant.children)); } -static int yaffs_del_dir(yaffs_obj_t *obj) +static int yaffs_del_dir(struct yaffs_obj *obj) { /* First check that the directory is empty. */ if (yaffs_is_non_empty_dir(obj)) @@ -3981,7 +3824,7 @@ static int yaffs_del_dir(yaffs_obj_t *obj) return yaffs_generic_obj_del(obj); } -static int yaffs_del_symlink(yaffs_obj_t *in) +static int yaffs_del_symlink(struct yaffs_obj *in) { if(in->variant.symlink_variant.alias) YFREE(in->variant.symlink_variant.alias); @@ -3990,60 +3833,60 @@ static int yaffs_del_symlink(yaffs_obj_t *in) return yaffs_generic_obj_del(in); } -static int yaffs_del_link(yaffs_obj_t *in) +static int yaffs_del_link(struct yaffs_obj *in) { /* remove this hardlink from the list assocaited with the equivalent * object */ - ylist_del_init(&in->hard_links); + list_del_init(&in->hard_links); return yaffs_generic_obj_del(in); } -int yaffs_del_obj(yaffs_obj_t *obj) +int yaffs_del_obj(struct yaffs_obj *obj) { -int retVal = -1; +int ret_val = -1; switch (obj->variant_type) { case YAFFS_OBJECT_TYPE_FILE: - retVal = yaffs_del_file(obj); + ret_val = yaffs_del_file(obj); break; case YAFFS_OBJECT_TYPE_DIRECTORY: - if(!ylist_empty(&obj->variant.dir_variant.dirty)){ + if(!list_empty(&obj->variant.dir_variant.dirty)){ T(YAFFS_TRACE_BACKGROUND, (TSTR("Remove object %d from dirty directories" TENDSTR),obj->obj_id)); - ylist_del_init(&obj->variant.dir_variant.dirty); + list_del_init(&obj->variant.dir_variant.dirty); } return yaffs_del_dir(obj); break; case YAFFS_OBJECT_TYPE_SYMLINK: - retVal = yaffs_del_symlink(obj); + ret_val = yaffs_del_symlink(obj); break; case YAFFS_OBJECT_TYPE_HARDLINK: - retVal = yaffs_del_link(obj); + ret_val = yaffs_del_link(obj); break; case YAFFS_OBJECT_TYPE_SPECIAL: - retVal = yaffs_generic_obj_del(obj); + ret_val = yaffs_generic_obj_del(obj); break; case YAFFS_OBJECT_TYPE_UNKNOWN: - retVal = 0; + ret_val = 0; break; /* should not happen. */ } - return retVal; + return ret_val; } -static int yaffs_unlink_worker(yaffs_obj_t *obj) +static int yaffs_unlink_worker(struct yaffs_obj *obj) { - int immediateDeletion = 0; + int del_now = 0; if (!obj->my_inode) - immediateDeletion = 1; + del_now = 1; if(obj) yaffs_update_parent(obj->parent); if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) { return yaffs_del_link(obj); - } else if (!ylist_empty(&obj->hard_links)) { + } else if (!list_empty(&obj->hard_links)) { /* Curve ball: We're unlinking an object that has a hardlink. * * This problem arises because we are not strictly following @@ -4058,34 +3901,34 @@ static int yaffs_unlink_worker(yaffs_obj_t *obj) * - Delete the hardlink */ - yaffs_obj_t *hl; - yaffs_obj_t *parent; - int retVal; + struct yaffs_obj *hl; + struct yaffs_obj *parent; + int ret_val; YCHAR name[YAFFS_MAX_NAME_LENGTH + 1]; - hl = ylist_entry(obj->hard_links.next, yaffs_obj_t, hard_links); + hl = list_entry(obj->hard_links.next, struct yaffs_obj, hard_links); yaffs_get_obj_name(hl, name, YAFFS_MAX_NAME_LENGTH + 1); parent = hl->parent; - ylist_del_init(&hl->hard_links); + list_del_init(&hl->hard_links); yaffs_add_obj_to_dir(obj->my_dev->unlinked_dir, hl); - retVal = yaffs_change_obj_name(obj,parent, name, 0, 0); + ret_val = yaffs_change_obj_name(obj,parent, name, 0, 0); - if (retVal == YAFFS_OK) - retVal = yaffs_generic_obj_del(hl); + if (ret_val == YAFFS_OK) + ret_val = yaffs_generic_obj_del(hl); - return retVal; + return ret_val; - } else if (immediateDeletion) { + } else if (del_now) { switch (obj->variant_type) { case YAFFS_OBJECT_TYPE_FILE: return yaffs_del_file(obj); break; case YAFFS_OBJECT_TYPE_DIRECTORY: - ylist_del_init(&obj->variant.dir_variant.dirty); + list_del_init(&obj->variant.dir_variant.dirty); return yaffs_del_dir(obj); break; case YAFFS_OBJECT_TYPE_SYMLINK: @@ -4107,7 +3950,7 @@ static int yaffs_unlink_worker(yaffs_obj_t *obj) } -static int yaffs_unlink_obj(yaffs_obj_t *obj) +static int yaffs_unlink_obj(struct yaffs_obj *obj) { if (obj && obj->unlink_allowed) @@ -4116,9 +3959,9 @@ static int yaffs_unlink_obj(yaffs_obj_t *obj) return YAFFS_FAIL; } -int yaffs_unlinker(yaffs_obj_t *dir, const YCHAR *name) +int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR *name) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; obj = yaffs_find_by_name(dir, name); return yaffs_unlink_obj(obj); @@ -4126,10 +3969,10 @@ int yaffs_unlinker(yaffs_obj_t *dir, const YCHAR *name) /*----------------------- Initialisation Scanning ---------------------- */ -void yaffs_handle_shadowed_obj(yaffs_dev_t *dev, int obj_id, +void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id, int backward_scanning) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; if (!backward_scanning) { /* Handle YAFFS1 forward scanning case @@ -4161,14 +4004,14 @@ void yaffs_handle_shadowed_obj(yaffs_dev_t *dev, int obj_id, } -void yaffs_link_fixup(yaffs_dev_t *dev, yaffs_obj_t *hard_list) +void yaffs_link_fixup(struct yaffs_dev *dev, struct yaffs_obj *hard_list) { - yaffs_obj_t *hl; - yaffs_obj_t *in; + struct yaffs_obj *hl; + struct yaffs_obj *in; while (hard_list) { hl = hard_list; - hard_list = (yaffs_obj_t *) (hard_list->hard_links.next); + hard_list = (struct yaffs_obj *) (hard_list->hard_links.next); in = yaffs_find_by_number(dev, hl->variant.hardlink_variant. @@ -4177,44 +4020,44 @@ void yaffs_link_fixup(yaffs_dev_t *dev, yaffs_obj_t *hard_list) if (in) { /* Add the hardlink pointers */ hl->variant.hardlink_variant.equiv_obj = in; - ylist_add(&hl->hard_links, &in->hard_links); + list_add(&hl->hard_links, &in->hard_links); } else { /* Todo Need to report/handle this better. * Got a problem... hardlink to a non-existant object */ hl->variant.hardlink_variant.equiv_obj = NULL; - YINIT_LIST_HEAD(&hl->hard_links); + INIT_LIST_HEAD(&hl->hard_links); } } } -static void yaffs_strip_deleted_objs(yaffs_dev_t *dev) +static void yaffs_strip_deleted_objs(struct yaffs_dev *dev) { /* * Sort out state of unlinked and deleted objects after scanning. */ - struct ylist_head *i; - struct ylist_head *n; - yaffs_obj_t *l; + struct list_head *i; + struct list_head *n; + struct yaffs_obj *l; if (dev->read_only) return; /* Soft delete all the unlinked files */ - ylist_for_each_safe(i, n, + list_for_each_safe(i, n, &dev->unlinked_dir->variant.dir_variant.children) { if (i) { - l = ylist_entry(i, yaffs_obj_t, siblings); + l = list_entry(i, struct yaffs_obj, siblings); yaffs_del_obj(l); } } - ylist_for_each_safe(i, n, + list_for_each_safe(i, n, &dev->del_dir->variant.dir_variant.children) { if (i) { - l = ylist_entry(i, yaffs_obj_t, siblings); + l = list_entry(i, struct yaffs_obj, siblings); yaffs_del_obj(l); } } @@ -4232,27 +4075,27 @@ static void yaffs_strip_deleted_objs(yaffs_dev_t *dev) * This code assumes that we don't ever change the current relationships between * directories: * root_dir->parent == unlinked_dir->parent == del_dir->parent == NULL - * lostNfound->parent == root_dir + * 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. */ -static int yaffs_has_null_parent(yaffs_dev_t *dev, yaffs_obj_t *obj) +static int yaffs_has_null_parent(struct yaffs_dev *dev, struct yaffs_obj *obj) { return (obj == dev->del_dir || obj == dev->unlinked_dir|| obj == dev->root_dir); } -static void yaffs_fix_hanging_objs(yaffs_dev_t *dev) +static void yaffs_fix_hanging_objs(struct yaffs_dev *dev) { - yaffs_obj_t *obj; - yaffs_obj_t *parent; + struct yaffs_obj *obj; + struct yaffs_obj *parent; int i; - struct ylist_head *lh; - struct ylist_head *n; - int depthLimit; + struct list_head *lh; + struct list_head *n; + int depth_limit; int hanging; if (dev->read_only) @@ -4264,9 +4107,9 @@ static void yaffs_fix_hanging_objs(yaffs_dev_t *dev) */ for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { - ylist_for_each_safe(lh, n, &dev->obj_bucket[i].list) { + list_for_each_safe(lh, n, &dev->obj_bucket[i].list) { if (lh) { - obj = ylist_entry(lh, yaffs_obj_t, hash_link); + obj = list_entry(lh, struct yaffs_obj, hash_link); parent= obj->parent; if(yaffs_has_null_parent(dev,obj)){ @@ -4282,14 +4125,14 @@ static void yaffs_fix_hanging_objs(yaffs_dev_t *dev) * Need to follow the parent chain to see if it is hanging. */ hanging = 0; - depthLimit=100; + depth_limit=100; while(parent != dev->root_dir && parent->parent && parent->parent->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY && - depthLimit > 0){ + depth_limit > 0){ parent = parent->parent; - depthLimit--; + depth_limit--; } if(parent != dev->root_dir) hanging = 1; @@ -4309,18 +4152,18 @@ static void yaffs_fix_hanging_objs(yaffs_dev_t *dev) /* * Delete directory contents for cleaning up lost and found. */ -static void yaffs_del_dir_contents(yaffs_obj_t *dir) +static void yaffs_del_dir_contents(struct yaffs_obj *dir) { - yaffs_obj_t *obj; - struct ylist_head *lh; - struct ylist_head *n; + struct yaffs_obj *obj; + struct list_head *lh; + struct list_head *n; if(dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) YBUG(); - ylist_for_each_safe(lh, n, &dir->variant.dir_variant.children) { + list_for_each_safe(lh, n, &dir->variant.dir_variant.children) { if (lh) { - obj = ylist_entry(lh, yaffs_obj_t, siblings); + obj = list_entry(lh, struct yaffs_obj, siblings); if(obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) yaffs_del_dir_contents(obj); @@ -4337,17 +4180,17 @@ static void yaffs_del_dir_contents(yaffs_obj_t *dir) } -static void yaffs_empty_l_n_f(yaffs_dev_t *dev) +static void yaffs_empty_l_n_f(struct yaffs_dev *dev) { yaffs_del_dir_contents(dev->lost_n_found); } -static void yaffs_check_obj_details_loaded(yaffs_obj_t *in) +static void yaffs_check_obj_details_loaded(struct yaffs_obj *in) { - __u8 *chunkData; - yaffs_obj_header *oh; - yaffs_dev_t *dev; - yaffs_ext_tags tags; + u8 *chunk_data; + struct yaffs_obj_hdr *oh; + struct yaffs_dev *dev; + struct yaffs_ext_tags tags; int result; int alloc_failed = 0; @@ -4356,36 +4199,15 @@ static void yaffs_check_obj_details_loaded(yaffs_obj_t *in) dev = in->my_dev; -#if 0 - T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR), - in->obj_id, - in->lazy_loaded ? "not yet" : "already")); -#endif - if (in->lazy_loaded && in->hdr_chunk > 0) { in->lazy_loaded = 0; - chunkData = yaffs_get_temp_buffer(dev, __LINE__); + chunk_data = yaffs_get_temp_buffer(dev, __LINE__); - result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, chunkData, &tags); - oh = (yaffs_obj_header *) chunkData; + result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, chunk_data, &tags); + oh = (struct yaffs_obj_hdr *) chunk_data; in->yst_mode = oh->yst_mode; -#ifdef CONFIG_YAFFS_WINCE - in->win_atime[0] = oh->win_atime[0]; - in->win_ctime[0] = oh->win_ctime[0]; - in->win_mtime[0] = oh->win_mtime[0]; - in->win_atime[1] = oh->win_atime[1]; - in->win_ctime[1] = oh->win_ctime[1]; - in->win_mtime[1] = oh->win_mtime[1]; -#else - in->yst_uid = oh->yst_uid; - in->yst_gid = oh->yst_gid; - in->yst_atime = oh->yst_atime; - in->yst_mtime = oh->yst_mtime; - in->yst_ctime = oh->yst_ctime; - in->yst_rdev = oh->yst_rdev; - -#endif + yaffs_load_attribs(in, oh); yaffs_set_obj_name_from_oh(in, oh); if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) { @@ -4395,7 +4217,7 @@ static void yaffs_check_obj_details_loaded(yaffs_obj_t *in) alloc_failed = 1; /* Not returned to caller */ } - yaffs_release_temp_buffer(dev, chunkData, __LINE__); + yaffs_release_temp_buffer(dev, chunk_data, __LINE__); } } @@ -4417,45 +4239,44 @@ static void yaffs_check_obj_details_loaded(yaffs_obj_t *in) * called periodically. */ -static void yaffs_update_parent(yaffs_obj_t *obj) +static void yaffs_update_parent(struct yaffs_obj *obj) { - yaffs_dev_t *dev; + struct yaffs_dev *dev; if(!obj) return; -#ifndef CONFIG_YAFFS_WINCE - dev = obj->my_dev; obj->dirty = 1; - obj->yst_mtime = obj->yst_ctime = Y_CURRENT_TIME; + yaffs_load_current_time(obj,0,1); if(dev->param.defered_dir_update){ - struct ylist_head *link = &obj->variant.dir_variant.dirty; + struct list_head *link = &obj->variant.dir_variant.dirty; - if(ylist_empty(link)){ - ylist_add(link,&dev->dirty_dirs); - T(YAFFS_TRACE_BACKGROUND, (TSTR("Added object %d to dirty directories" TENDSTR),obj->obj_id)); + if(list_empty(link)){ + list_add(link,&dev->dirty_dirs); + T(YAFFS_TRACE_BACKGROUND, + (TSTR("Added object %d to dirty directories" TENDSTR), + obj->obj_id)); } } else yaffs_update_oh(obj, NULL, 0, 0, 0, NULL); -#endif } -void yaffs_update_dirty_dirs(yaffs_dev_t *dev) +void yaffs_update_dirty_dirs(struct yaffs_dev *dev) { - struct ylist_head *link; - yaffs_obj_t *obj; - yaffs_dir_s *dS; - yaffs_obj_variant *oV; + struct list_head *link; + struct yaffs_obj *obj; + struct yaffs_dir_var *d_s; + union yaffs_obj_var *o_v; T(YAFFS_TRACE_BACKGROUND, (TSTR("Update dirty directories" TENDSTR))); - while(!ylist_empty(&dev->dirty_dirs)){ + while(!list_empty(&dev->dirty_dirs)){ link = dev->dirty_dirs.next; - ylist_del_init(link); + list_del_init(link); - dS=ylist_entry(link,yaffs_dir_s,dirty); - oV = ylist_entry(dS,yaffs_obj_variant,dir_variant); - obj = ylist_entry(oV,yaffs_obj_t,variant); + d_s=list_entry(link,struct yaffs_dir_var,dirty); + o_v = list_entry(d_s,union yaffs_obj_var,dir_variant); + obj = list_entry(o_v,struct yaffs_obj,variant); T(YAFFS_TRACE_BACKGROUND, (TSTR("Update directory %d" TENDSTR), obj->obj_id)); @@ -4464,10 +4285,10 @@ void yaffs_update_dirty_dirs(yaffs_dev_t *dev) } } -static void yaffs_remove_obj_from_dir(yaffs_obj_t *obj) +static void yaffs_remove_obj_from_dir(struct yaffs_obj *obj) { - yaffs_dev_t *dev = obj->my_dev; - yaffs_obj_t *parent; + struct yaffs_dev *dev = obj->my_dev; + struct yaffs_obj *parent; yaffs_verify_obj_in_dir(obj); parent = obj->parent; @@ -4478,14 +4299,14 @@ static void yaffs_remove_obj_from_dir(yaffs_obj_t *obj) dev->param.remove_obj_fn(obj); - ylist_del_init(&obj->siblings); + list_del_init(&obj->siblings); obj->parent = NULL; yaffs_verify_dir(parent); } -void yaffs_add_obj_to_dir(yaffs_obj_t *directory, - yaffs_obj_t *obj) +void yaffs_add_obj_to_dir(struct yaffs_obj *directory, + struct yaffs_obj *obj) { if (!directory) { T(YAFFS_TRACE_ALWAYS, @@ -4515,7 +4336,7 @@ void yaffs_add_obj_to_dir(yaffs_obj_t *directory, /* Now add it */ - ylist_add(&obj->siblings, &directory->variant.dir_variant.children); + list_add(&obj->siblings, &directory->variant.dir_variant.children); obj->parent = directory; if (directory == obj->my_dev->unlinked_dir @@ -4529,15 +4350,15 @@ void yaffs_add_obj_to_dir(yaffs_obj_t *directory, yaffs_verify_obj_in_dir(obj); } -yaffs_obj_t *yaffs_find_by_name(yaffs_obj_t *directory, +struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory, const YCHAR *name) { int sum; - struct ylist_head *i; + struct list_head *i; YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1]; - yaffs_obj_t *l; + struct yaffs_obj *l; if (!name) return NULL; @@ -4559,9 +4380,9 @@ yaffs_obj_t *yaffs_find_by_name(yaffs_obj_t *directory, sum = yaffs_calc_name_sum(name); - ylist_for_each(i, &directory->variant.dir_variant.children) { + list_for_each(i, &directory->variant.dir_variant.children) { if (i) { - l = ylist_entry(i, yaffs_obj_t, siblings); + l = list_entry(i, struct yaffs_obj, siblings); if (l->parent != directory) YBUG(); @@ -4588,47 +4409,11 @@ yaffs_obj_t *yaffs_find_by_name(yaffs_obj_t *directory, } -#if 0 -int yaffs_ApplyToDirectoryChildren(yaffs_obj_t *the_dir, - int (*fn) (yaffs_obj_t *)) -{ - struct ylist_head *i; - yaffs_obj_t *l; - - if (!the_dir) { - T(YAFFS_TRACE_ALWAYS, - (TSTR - ("tragedy: yaffs_find_by_name: null pointer directory" - TENDSTR))); - YBUG(); - return YAFFS_FAIL; - } - if (the_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) { - T(YAFFS_TRACE_ALWAYS, - (TSTR - ("tragedy: yaffs_find_by_name: non-directory" TENDSTR))); - YBUG(); - return YAFFS_FAIL; - } - - ylist_for_each(i, &the_dir->variant.dir_variant.children) { - if (i) { - l = ylist_entry(i, yaffs_obj_t, siblings); - if (l && !fn(l)) - return YAFFS_FAIL; - } - } - - return YAFFS_OK; - -} -#endif - /* GetEquivalentObject dereferences any hard links to get to the * actual object. */ -yaffs_obj_t *yaffs_get_equivalent_obj(yaffs_obj_t *obj) +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 */ @@ -4657,91 +4442,91 @@ yaffs_obj_t *yaffs_get_equivalent_obj(yaffs_obj_t *obj) * starting at oh->name[1]. */ -static void yaffs_fix_null_name(yaffs_obj_t * obj,YCHAR * name, int buffer_size) +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. */ if(yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH) == 0){ - YCHAR locName[20]; - YCHAR numString[20]; - YCHAR *x = &numString[19]; + YCHAR local_name[20]; + YCHAR num_string[20]; + YCHAR *x = &num_string[19]; unsigned v = obj->obj_id; - numString[19] = 0; + num_string[19] = 0; while(v>0){ x--; *x = '0' + (v % 10); v /= 10; } /* make up a name */ - yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX); - yaffs_strcat(locName,x); - yaffs_strncpy(name, locName, buffer_size - 1); + yaffs_strcpy(local_name, YAFFS_LOSTNFOUND_PREFIX); + yaffs_strcat(local_name,x); + yaffs_strncpy(name, local_name, buffer_size - 1); } } -static void yaffs_load_name_from_oh(yaffs_dev_t *dev,YCHAR *name, const YCHAR *ohName, int bufferSize) +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){ - if(*ohName){ + if(*oh_name){ /* It is an ASCII name, so do an ASCII to unicode conversion */ - const char *asciiOhName = (const char *)ohName; - int n = bufferSize - 1; - while(n > 0 && *asciiOhName){ - *name = *asciiOhName; + const char *ascii_oh_name = (const char *)oh_name; + int n = buff_size - 1; + while(n > 0 && *ascii_oh_name){ + *name = *ascii_oh_name; name++; - asciiOhName++; + ascii_oh_name++; n--; } } else - yaffs_strncpy(name,ohName+1, bufferSize -1); + yaffs_strncpy(name,oh_name+1, buff_size -1); } else #endif - yaffs_strncpy(name, ohName, bufferSize - 1); + yaffs_strncpy(name, oh_name, buff_size - 1); } -static void yaffs_load_oh_from_name(yaffs_dev_t *dev, YCHAR *ohName, 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 - int isAscii; + int is_ascii; YCHAR *w; if(dev->param.auto_unicode){ - isAscii = 1; + is_ascii = 1; w = name; /* Figure out if the name will fit in ascii character set */ - while(isAscii && *w){ + while(is_ascii && *w){ if((*w) & 0xff00) - isAscii = 0; + is_ascii = 0; w++; } - if(isAscii){ + if(is_ascii){ /* It is an ASCII name, so do a unicode to ascii conversion */ - char *asciiOhName = (char *)ohName; + char *ascii_oh_name = (char *)oh_name; int n = YAFFS_MAX_NAME_LENGTH - 1; while(n > 0 && *name){ - *asciiOhName= *name; + *ascii_oh_name= *name; name++; - asciiOhName++; + ascii_oh_name++; n--; } } else{ /* It is a unicode name, so save starting at the second YCHAR */ - *ohName = 0; - yaffs_strncpy(ohName+1,name, YAFFS_MAX_NAME_LENGTH -2); + *oh_name = 0; + yaffs_strncpy(oh_name+1,name, YAFFS_MAX_NAME_LENGTH -2); } } else #endif - yaffs_strncpy(ohName,name, YAFFS_MAX_NAME_LENGTH - 1); + yaffs_strncpy(oh_name,name, YAFFS_MAX_NAME_LENGTH - 1); } -int yaffs_get_obj_name(yaffs_obj_t * 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)); @@ -4757,9 +4542,9 @@ int yaffs_get_obj_name(yaffs_obj_t * obj, YCHAR * name, int buffer_size) #endif 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, __LINE__); - yaffs_obj_header *oh = (yaffs_obj_header *) buffer; + struct yaffs_obj_hdr *oh = (struct yaffs_obj_hdr *) buffer; memset(buffer, 0, obj->my_dev->data_bytes_per_chunk); @@ -4779,7 +4564,7 @@ int yaffs_get_obj_name(yaffs_obj_t * obj, YCHAR * name, int buffer_size) } -int yaffs_get_obj_length(yaffs_obj_t *obj) +int yaffs_get_obj_length(struct yaffs_obj *obj) { /* Dereference any hard linking */ obj = yaffs_get_equivalent_obj(obj); @@ -4796,28 +4581,28 @@ int yaffs_get_obj_length(yaffs_obj_t *obj) } } -int yaffs_get_obj_link_count(yaffs_obj_t *obj) +int yaffs_get_obj_link_count(struct yaffs_obj *obj) { int count = 0; - struct ylist_head *i; + struct list_head *i; if (!obj->unlinked) count++; /* the object itself */ - ylist_for_each(i, &obj->hard_links) + list_for_each(i, &obj->hard_links) count++; /* add the hard links; */ return count; } -int yaffs_get_obj_inode(yaffs_obj_t *obj) +int yaffs_get_obj_inode(struct yaffs_obj *obj) { obj = yaffs_get_equivalent_obj(obj); return obj->obj_id; } -unsigned yaffs_get_obj_type(yaffs_obj_t *obj) +unsigned yaffs_get_obj_type(struct yaffs_obj *obj) { obj = yaffs_get_equivalent_obj(obj); @@ -4849,7 +4634,7 @@ unsigned yaffs_get_obj_type(yaffs_obj_t *obj) } } -YCHAR *yaffs_get_symlink_alias(yaffs_obj_t *obj) +YCHAR *yaffs_get_symlink_alias(struct yaffs_obj *obj) { obj = yaffs_get_equivalent_obj(obj); if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) @@ -4858,66 +4643,9 @@ YCHAR *yaffs_get_symlink_alias(yaffs_obj_t *obj) return yaffs_clone_str(_Y("")); } -#ifndef CONFIG_YAFFS_WINCE - -int yaffs_set_attribs(yaffs_obj_t *obj, struct iattr *attr) +static int yaffs_do_xattrib_mod(struct yaffs_obj *obj, int set, const YCHAR *name, const void *value, int size, int flags) { - unsigned int valid = attr->ia_valid; - - if (valid & ATTR_MODE) - obj->yst_mode = attr->ia_mode; - if (valid & ATTR_UID) - obj->yst_uid = attr->ia_uid; - if (valid & ATTR_GID) - obj->yst_gid = attr->ia_gid; - - if (valid & ATTR_ATIME) - obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime); - if (valid & ATTR_CTIME) - obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime); - if (valid & ATTR_MTIME) - obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime); - - if (valid & ATTR_SIZE) - yaffs_resize_file(obj, attr->ia_size); - - yaffs_update_oh(obj, NULL, 1, 0, 0, NULL); - - return YAFFS_OK; - -} -int yaffs_get_attribs(yaffs_obj_t *obj, struct iattr *attr) -{ - unsigned int valid = 0; - - attr->ia_mode = obj->yst_mode; - valid |= ATTR_MODE; - attr->ia_uid = obj->yst_uid; - valid |= ATTR_UID; - attr->ia_gid = obj->yst_gid; - valid |= ATTR_GID; - - Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime; - valid |= ATTR_ATIME; - Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime; - valid |= ATTR_CTIME; - Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime; - valid |= ATTR_MTIME; - - attr->ia_size = yaffs_get_file_size(obj); - valid |= ATTR_SIZE; - - attr->ia_valid = valid; - - return YAFFS_OK; -} - -#endif - - -static int yaffs_do_xattrib_mod(yaffs_obj_t *obj, int set, const YCHAR *name, const void *value, int size, int flags) -{ - yaffs_xattr_mod xmod; + struct yaffs_xattr_mod xmod; int result; @@ -4936,12 +4664,12 @@ static int yaffs_do_xattrib_mod(yaffs_obj_t *obj, int set, const YCHAR *name, co return -ENOSPC; } -static int yaffs_apply_xattrib_mod(yaffs_obj_t *obj, char *buffer, yaffs_xattr_mod *xmod) +static int yaffs_apply_xattrib_mod(struct yaffs_obj *obj, char *buffer, struct yaffs_xattr_mod *xmod) { int retval = 0; - int x_offs = sizeof(yaffs_obj_header); - yaffs_dev_t *dev = obj->my_dev; - int x_size = dev->data_bytes_per_chunk - sizeof(yaffs_obj_header); + 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; @@ -4958,14 +4686,14 @@ static int yaffs_apply_xattrib_mod(yaffs_obj_t *obj, char *buffer, yaffs_xattr_m return retval; } -static int yaffs_do_xattrib_fetch(yaffs_obj_t *obj, const YCHAR *name, void *value, int size) +static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR *name, void *value, int size) { char *buffer = NULL; int result; - yaffs_ext_tags tags; - yaffs_dev_t *dev = obj->my_dev; - int x_offs = sizeof(yaffs_obj_header); - int x_size = dev->data_bytes_per_chunk - sizeof(yaffs_obj_header); + struct yaffs_ext_tags tags; + 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; @@ -4988,7 +4716,7 @@ static int yaffs_do_xattrib_fetch(yaffs_obj_t *obj, const YCHAR *name, void *val if(!buffer) return -ENOMEM; - result = yaffs_rd_chunk_tags_nand(dev,obj->hdr_chunk, (__u8 *)buffer, &tags); + result = yaffs_rd_chunk_tags_nand(dev,obj->hdr_chunk, (u8 *)buffer, &tags); if(result != YAFFS_OK) retval = -ENOENT; @@ -5005,54 +4733,33 @@ static int yaffs_do_xattrib_fetch(yaffs_obj_t *obj, const YCHAR *name, void *val 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,__LINE__); return retval; } -int yaffs_set_xattrib(yaffs_obj_t *obj, const YCHAR *name, const void * value, int size, int flags) +int yaffs_set_xattrib(struct yaffs_obj *obj, const YCHAR *name, const void * value, int size, int flags) { return yaffs_do_xattrib_mod(obj, 1, name, value, size, flags); } -int yaffs_remove_xattrib(yaffs_obj_t *obj, const YCHAR *name) +int yaffs_remove_xattrib(struct yaffs_obj *obj, const YCHAR *name) { return yaffs_do_xattrib_mod(obj, 0, name, NULL, 0, 0); } -int yaffs_get_xattrib(yaffs_obj_t *obj, const YCHAR *name, void *value, int size) +int yaffs_get_xattrib(struct yaffs_obj *obj, const YCHAR *name, void *value, int size) { return yaffs_do_xattrib_fetch(obj, name, value, size); } -int yaffs_list_xattrib(yaffs_obj_t *obj, char *buffer, int size) +int yaffs_list_xattrib(struct yaffs_obj *obj, char *buffer, int size) { return yaffs_do_xattrib_fetch(obj, NULL, buffer,size); } - - -#if 0 -int yaffs_dump_obj(yaffs_obj_t *obj) -{ - YCHAR name[257]; - - yaffs_get_obj_name(obj, name, YAFFS_MAX_NAME_LENGTH + 1); - - T(YAFFS_TRACE_ALWAYS, - (TSTR - ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d" - " chunk %d type %d size %d\n" - TENDSTR), obj->obj_id, yaffs_get_obj_inode(obj), name, - obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdr_chunk, - yaffs_get_obj_type(obj), yaffs_get_obj_length(obj))); - - return YAFFS_OK; -} -#endif - /*---------------------------- Initialisation code -------------------------------------- */ -static int yaffs_cehck_dev_fns(const yaffs_dev_t *dev) +static int yaffs_check_dev_fns(const struct yaffs_dev *dev) { /* Common functions, gotta have */ @@ -5085,7 +4792,7 @@ static int yaffs_cehck_dev_fns(const yaffs_dev_t *dev) } -static int yaffs_create_initial_dir(yaffs_dev_t *dev) +static int yaffs_create_initial_dir(struct yaffs_dev *dev) { /* Initialise the unlinked, deleted, root and lost and found directories */ @@ -5113,7 +4820,7 @@ static int yaffs_create_initial_dir(yaffs_dev_t *dev) return YAFFS_FAIL; } -int yaffs_guts_initialise(yaffs_dev_t *dev) +int yaffs_guts_initialise(struct yaffs_dev *dev) { int init_failed = 0; unsigned x; @@ -5168,12 +4875,12 @@ int yaffs_guts_initialise(yaffs_dev_t *dev) /* Sort out space for inband tags, if required */ if (dev->param.inband_tags) - dev->data_bytes_per_chunk = dev->param.total_bytes_per_chunk - sizeof(yaffs_PackedTags2TagsPart); + dev->data_bytes_per_chunk = dev->param.total_bytes_per_chunk - sizeof(struct yaffs_packed_tags2_tags_only); else dev->data_bytes_per_chunk = dev->param.total_bytes_per_chunk; /* Got the right mix of functions? */ - if (!yaffs_cehck_dev_fns(dev)) { + if (!yaffs_check_dev_fns(dev)) { /* Function missing */ T(YAFFS_TRACE_ALWAYS, (TSTR @@ -5182,13 +4889,6 @@ int yaffs_guts_initialise(yaffs_dev_t *dev) return YAFFS_FAIL; } - /* This is really a compilation check. */ - if (!yaffs_check_structures()) { - T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs_check_structures failed\n" TENDSTR))); - return YAFFS_FAIL; - } - if (dev->is_mounted) { T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: device already mounted\n" TENDSTR))); @@ -5206,7 +4906,7 @@ int yaffs_guts_initialise(yaffs_dev_t *dev) */ x = dev->data_bytes_per_chunk; /* We always use dev->chunk_shift and dev->chunk_div */ - dev->chunk_shift = Shifts(x); + dev->chunk_shift = calc_shifts(x); x >>= dev->chunk_shift; dev->chunk_div = x; /* We only use chunk mask if chunk_div is 1 */ @@ -5219,7 +4919,7 @@ int yaffs_guts_initialise(yaffs_dev_t *dev) x = dev->param.chunks_per_block * (dev->internal_end_block + 1); - bits = ShiftsGE(x); + bits = calc_shifts_ceiling(x); /* Set up tnode width if wide tnodes are enabled. */ if (!dev->param.wide_tnodes_disabled) { @@ -5247,8 +4947,8 @@ int yaffs_guts_initialise(yaffs_dev_t *dev) dev->chunk_grp_bits = bits - dev->tnode_width; dev->tnode_size = (dev->tnode_width * YAFFS_NTNODES_LEVEL0)/8; - if(dev->tnode_size < sizeof(yaffs_tnode_t)) - dev->tnode_size = sizeof(yaffs_tnode_t); + if(dev->tnode_size < sizeof(struct yaffs_tnode)) + dev->tnode_size = sizeof(struct yaffs_tnode); dev->chunk_grp_size = 1 << dev->chunk_grp_bits; @@ -5284,7 +4984,7 @@ int yaffs_guts_initialise(yaffs_dev_t *dev) 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 */ - YINIT_LIST_HEAD(&dev->dirty_dirs); + INIT_LIST_HEAD(&dev->dirty_dirs); dev->oldest_dirty_seq = 0; dev->oldest_dirty_block = 0; @@ -5300,17 +5000,17 @@ int yaffs_guts_initialise(yaffs_dev_t *dev) dev->param.n_caches > 0) { int i; void *buf; - int cacheBytes = dev->param.n_caches * sizeof(yaffs_cache_t); + int cache_bytes = dev->param.n_caches * sizeof(struct yaffs_cache); if (dev->param.n_caches > YAFFS_MAX_SHORT_OP_CACHES) dev->param.n_caches = YAFFS_MAX_SHORT_OP_CACHES; - dev->cache = YMALLOC(cacheBytes); + dev->cache = YMALLOC(cache_bytes); - buf = (__u8 *) dev->cache; + buf = (u8 *) dev->cache; if (dev->cache) - memset(dev->cache, 0, cacheBytes); + memset(dev->cache, 0, cache_bytes); for (i = 0; i < dev->param.n_caches && buf; i++) { dev->cache[i].object = NULL; @@ -5327,7 +5027,7 @@ int yaffs_guts_initialise(yaffs_dev_t *dev) dev->cache_hits = 0; if (!init_failed) { - dev->gc_cleanup_list = YMALLOC(dev->param.chunks_per_block * sizeof(__u32)); + dev->gc_cleanup_list = YMALLOC(dev->param.chunks_per_block * sizeof(u32)); if (!dev->gc_cleanup_list) init_failed = 1; } @@ -5419,7 +5119,7 @@ int yaffs_guts_initialise(yaffs_dev_t *dev) } -void yaffs_deinitialise(yaffs_dev_t *dev) +void yaffs_deinitialise(struct yaffs_dev *dev) { if (dev->is_mounted) { int i; @@ -5451,12 +5151,12 @@ void yaffs_deinitialise(yaffs_dev_t *dev) } } -int yaffs_count_free_chunks(yaffs_dev_t *dev) +int yaffs_count_free_chunks(struct yaffs_dev *dev) { - int nFree=0; + int n_free=0; int b; - yaffs_block_info_t *blk; + struct yaffs_block_info *blk; blk = dev->block_info; for (b = dev->internal_start_block; b <= dev->internal_end_block; b++) { @@ -5465,7 +5165,7 @@ int yaffs_count_free_chunks(yaffs_dev_t *dev) case YAFFS_BLOCK_STATE_ALLOCATING: case YAFFS_BLOCK_STATE_COLLECTING: case YAFFS_BLOCK_STATE_FULL: - nFree += + n_free += (dev->param.chunks_per_block - blk->pages_in_use + blk->soft_del_pages); break; @@ -5475,70 +5175,40 @@ int yaffs_count_free_chunks(yaffs_dev_t *dev) blk++; } - return nFree; + return n_free; } -int yaffs_get_n_free_chunks(yaffs_dev_t *dev) +int yaffs_get_n_free_chunks(struct yaffs_dev *dev) { /* This is what we report to the outside world */ - int nFree; - int nDirtyCacheChunks; - int blocksForCheckpoint; + int n_free; + int n_dirty_caches; + int blocks_for_checkpt; int i; -#if 1 - nFree = dev->n_free_chunks; -#else - nFree = yaffs_count_free_chunks(dev); -#endif - - nFree += dev->n_deleted_files; + 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 */ - for (nDirtyCacheChunks = 0, i = 0; i < dev->param.n_caches; i++) { + for (n_dirty_caches = 0, i = 0; i < dev->param.n_caches; i++) { if (dev->cache[i].dirty) - nDirtyCacheChunks++; + n_dirty_caches++; } - nFree -= nDirtyCacheChunks; + n_free -= n_dirty_caches; - nFree -= ((dev->param.n_reserved_blocks + 1) * dev->param.chunks_per_block); + 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... */ - blocksForCheckpoint = yaffs_calc_checkpt_blocks_required(dev); + blocks_for_checkpt = yaffs_calc_checkpt_blocks_required(dev); - nFree -= (blocksForCheckpoint * dev->param.chunks_per_block); + n_free -= (blocks_for_checkpt * dev->param.chunks_per_block); - if (nFree < 0) - nFree = 0; + if (n_free < 0) + n_free = 0; - return nFree; + return n_free; } - - -/*---------------------------------------- YAFFS test code ----------------------*/ - -#define yaffs_check_struct(structure, syze, name) \ - do { \ - if (sizeof(structure) != syze) { \ - T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\ - name, syze, (int) sizeof(structure))); \ - return YAFFS_FAIL; \ - } \ - } while (0) - -static int yaffs_check_structures(void) -{ -/* yaffs_check_struct(yaffs_tags_t,8,"yaffs_tags_t"); */ -/* yaffs_check_struct(yaffs_tags_union_t,8,"yaffs_tags_union_t"); */ -/* yaffs_check_struct(yaffs_spare,16,"yaffs_spare"); */ -/* yaffs_check_struct(yaffs_tnode_t, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_tnode_t"); */ - -#ifndef CONFIG_YAFFS_WINCE - yaffs_check_struct(yaffs_obj_header, 512, "yaffs_obj_header"); -#endif - return YAFFS_OK; -}