diff options
59 files changed, 1677 insertions, 1677 deletions
diff --git a/direct/basic-test/dtest.c b/direct/basic-test/dtest.c index c56e5b2..f272f0c 100644 --- a/direct/basic-test/dtest.c +++ b/direct/basic-test/dtest.c @@ -25,7 +25,7 @@ #include "yaffs_guts.h" /* Only for dumping device innards */ -extern int yaffs_traceMask; +extern int yaffs_trace_mask; void dumpDir(const char *dname); @@ -278,7 +278,7 @@ void yaffs_backward_scan_test(const char *path) { char fn[100]; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(path); @@ -299,7 +299,7 @@ void null_name_test(const char *path) { char fn[100]; int h; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(path); @@ -320,7 +320,7 @@ void yaffs_device_flush_test(const char *path) int h; int i; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(path); @@ -349,7 +349,7 @@ void short_scan_test(const char *path, int fsize, int niterations) sprintf(fn,"%s/%s",path,"f1"); - yaffs_StartUp(); + yaffs_start_up(); for(i = 0; i < niterations; i++) { printf("\n*****************\nIteration %d\n",i); @@ -374,7 +374,7 @@ void scan_pattern_test(const char *path, int fsize, int niterations) sprintf(fn[1],"%s/%s",path,"f1"); sprintf(fn[2],"%s/%s",path,"f2"); - yaffs_StartUp(); + yaffs_start_up(); for(i = 0; i < niterations; i++) { @@ -656,7 +656,7 @@ int long_test(int argc, char *argv[]) mode_t temp_mode; struct yaffs_stat ystat; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount("/boot"); yaffs_mount("/data"); @@ -866,11 +866,11 @@ int long_test(int argc, char *argv[]) yaffs_unlink("/boot/zlf"); - yaffs_DumpDevStruct("/boot"); + yaffs_dump_dev("/boot"); fill_disk_and_delete("/boot",20,20); - yaffs_DumpDevStruct("/boot"); + yaffs_dump_dev("/boot"); fill_files("/boot",1,10000,0); fill_files("/boot",1,10000,5000); @@ -884,8 +884,8 @@ int long_test(int argc, char *argv[]) leave_unlinked_file("/data",20000,5000); leave_unlinked_file("/data",20000,5000); - yaffs_DumpDevStruct("/boot"); - yaffs_DumpDevStruct("/data"); + yaffs_dump_dev("/boot"); + yaffs_dump_dev("/data"); @@ -909,7 +909,7 @@ int huge_directory_test_on_path(char *path) char str[100]; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(path); @@ -967,7 +967,7 @@ void rename_over_test(const char *mountpt) sprintf(b,"%s/b",mountpt); sprintf(c,"%s/c",mountpt); - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -1004,7 +1004,7 @@ int resize_stress_test(const char *path) char abuffer[1000]; char bbuffer[1000]; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(path); @@ -1065,7 +1065,7 @@ int overwrite_test(const char *path) int j; int a; int b; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(path); @@ -1090,7 +1090,7 @@ int root_perm_remount(const char *path) { struct yaffs_stat s; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(path); @@ -1121,7 +1121,7 @@ int resize_stress_test_no_grow_complex(const char *path,int iters) char bbuffer[1000]; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(path); @@ -1195,7 +1195,7 @@ int resize_stress_test_no_grow(const char *path,int iters) char abuffer[1000]; char bbuffer[1000]; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(path); @@ -1260,7 +1260,7 @@ int resize_stress_test_no_grow(const char *path,int iters) int directory_rename_test(void) { int r; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount("/ram"); yaffs_mkdir("/ram/a",0); @@ -1300,7 +1300,7 @@ int cache_read_test(void) int sizeOfFiles = 500000; char buffer[100]; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount("/boot"); @@ -1339,7 +1339,7 @@ int cache_bypass_bug_test(void) memset(buffer1,0,sizeof(buffer1)); memset(buffer2,0,sizeof(buffer2)); - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount("/boot"); @@ -1379,7 +1379,7 @@ int free_space_check(void) { int f; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount("/boot"); fill_disk("/boot/",2); f = yaffs_freespace("/boot"); @@ -1397,7 +1397,7 @@ int truncate_test(void) char y[10]; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount("/boot"); yaffs_unlink("/boot/trunctest"); @@ -1435,7 +1435,7 @@ int truncate_test(void) void fill_disk_test(const char *mountpt) { int i; - yaffs_StartUp(); + yaffs_start_up(); for(i = 0; i < 5; i++) { @@ -1450,7 +1450,7 @@ void fill_disk_test(const char *mountpt) void fill_files_test(const char *mountpt) { int i; - yaffs_StartUp(); + yaffs_start_up(); for(i = 0; i < 5; i++) { @@ -1464,7 +1464,7 @@ void fill_files_test(const char *mountpt) void fill_empty_files_test(const char *mountpt) { int i; - yaffs_StartUp(); + yaffs_start_up(); char name[100]; int result = 0; @@ -1493,7 +1493,7 @@ void fill_empty_files_test(const char *mountpt) void long_name_test(const char *mountpt) { int i; - yaffs_StartUp(); + yaffs_start_up(); char fullName[1000]; char name[300]; int result = 0; @@ -1548,7 +1548,7 @@ void lookup_test(const char *mountpt) yaffs_DIR *d; yaffs_dirent *de; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -1607,7 +1607,7 @@ void link_test0(const char *mountpt) int result = 0; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -1656,7 +1656,7 @@ void link_test1(const char *mountpt) sprintf(b,"%s/bbb",mountpt); sprintf(c,"%s/ccc",mountpt); - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -1691,7 +1691,7 @@ void handle_test(const char *mountpt) sprintf(a,"%s/aaa",mountpt); - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -1725,7 +1725,7 @@ void freespace_test(const char *mountpt) int f3; sprintf(a,"%s/aaa",mountpt); - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -1766,7 +1766,7 @@ void simple_rw_test(const char *mountpt) sprintf(a,"%s/aaa",mountpt); - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -1819,7 +1819,7 @@ void scan_deleted_files_test(const char *mountpt) int h; sprintf(sub,"%s/sdir",mountpt); - yaffs_StartUp(); + yaffs_start_up(); for(j = 0; j < 10; j++) { @@ -1952,7 +1952,7 @@ void check_resize_gc_bug(const char *mountpt) - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); yaffs_unlink(a); yaffs_unlink(b); @@ -1982,7 +1982,7 @@ void multi_mount_test(const char *mountpt,int nmounts) sprintf(a,"%s/a",mountpt); - yaffs_StartUp(); + yaffs_start_up(); for(i = 0; i < nmounts; i++){ int h0; @@ -2059,7 +2059,7 @@ void small_mount_test(const char *mountpt,int nmounts) sprintf(a,"%s/a",mountpt); - yaffs_StartUp(); + yaffs_start_up(); @@ -2131,7 +2131,7 @@ void small_overwrite_test(const char *mountpt,int nmounts) sprintf(a,"%s/a",mountpt); - yaffs_StartUp(); + yaffs_start_up(); @@ -2186,7 +2186,7 @@ void seek_overwrite_test(const char *mountpt,int nmounts) sprintf(a,"%s/f",mountpt); - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -2232,7 +2232,7 @@ void checkpoint_fill_test(const char *mountpt,int nmounts) - yaffs_StartUp(); + yaffs_start_up(); for(i = 0; i < nmounts; i++){ printf("############### Iteration %d Start\n",i); @@ -2306,7 +2306,7 @@ void checkpoint_upgrade_test(const char *mountpt,int nmounts) printf("Create start condition\n"); - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); yaffs_mkdir(a,0); sprintf(b,"%s/zz",a); @@ -2361,7 +2361,7 @@ void huge_array_test(const char *mountpt,int n) - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -2436,7 +2436,7 @@ void random_small_file_test(const char *mountpt,int iterations) int r; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -2495,7 +2495,7 @@ void random_small_file_test(const char *mountpt,int iterations) void rmdir_test(const char *mountpt) { char name[100]; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -2556,7 +2556,7 @@ void basic_xattr_test(const char *mountpt) int result; int val1; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -2606,7 +2606,7 @@ void big_xattr_test(const char *mountpt) int result; char val[1000]; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); @@ -2660,9 +2660,9 @@ void test_flash_traffic(const char *mountpt) int i; yaffs_Device *dev; - yaffs_traceMask = 0; + yaffs_trace_mask = 0; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(mountpt); diff --git a/direct/basic-test/yaffs_fileem2k.c b/direct/basic-test/yaffs_fileem2k.c index 84b7eb8..a939e26 100644 --- a/direct/basic-test/yaffs_fileem2k.c +++ b/direct/basic-test/yaffs_fileem2k.c @@ -62,7 +62,7 @@ typedef struct static yflash_Device filedisk; -int yaffs_testPartialWrite = 0; +int yaffs_test_partial_write = 0; extern int random_seed; extern int simulate_power_failure; @@ -198,7 +198,7 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u written = write(h,data,dev->param.totalBytesPerChunk); - if(yaffs_testPartialWrite){ + if(yaffs_test_partial_write){ close(h); exit(1); } @@ -235,7 +235,7 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u lseek(h,pos,SEEK_SET); written = write(h,localBuffer,dev->nDataBytesPerChunk); - if(yaffs_testPartialWrite){ + if(yaffs_test_partial_write){ close(h); exit(1); } @@ -314,7 +314,7 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u lseek(h,pos,SEEK_SET); written = write(h,localBuffer,dev->nDataBytesPerChunk); - if(yaffs_testPartialWrite){ + if(yaffs_test_partial_write){ close(h); exit(1); } @@ -371,7 +371,7 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u } -int yaffs_CheckAllFF(const __u8 *ptr, int n) +int yaffs_check_all_ff(const __u8 *ptr, int n) { while(n) { @@ -408,7 +408,7 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *d /* Got to suck the tags out of the data area */ if(!data) { localData=1; - data = yaffs_GetTempBuffer(dev,__LINE__); + data = yaffs_get_temp_buffer(dev,__LINE__); } @@ -423,13 +423,13 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *d nRead = read(h, data,dev->param.totalBytesPerChunk); - yaffs_UnpackTags2TagsPart(tags,pt2tp); + yaffs_unpack_tags2tags_part(tags,pt2tp); if(nread != dev->param.totalBytesPerChunk) retval = YAFFS_FAIL; if(localData) - yaffs_ReleaseTempBuffer(dev,data,__LINE__); + yaffs_release_temp_buffer(dev,data,__LINE__); @@ -461,9 +461,9 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *d nread= read(h,tags,sizeof(yaffs_ExtendedTags)); if(nread != sizeof(yaffs_ExtendedTags)) retval = YAFFS_FAIL; - if(yaffs_CheckAllFF((__u8 *)tags,sizeof(yaffs_ExtendedTags))) + if(yaffs_check_all_ff((__u8 *)tags,sizeof(yaffs_ExtendedTags))) { - yaffs_InitialiseTags(tags); + yaffs_init_tags(tags); } else { @@ -474,7 +474,7 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *d { yaffs_PackedTags2 pt; nread= read(h,&pt,sizeof(pt)); - yaffs_UnpackTags2(tags,&pt, !dev->param.noTagsECC); + yaffs_unpack_tags2(tags,&pt, !dev->param.noTagsECC); #ifdef SIMULATE_FAILURES if((chunkInNAND >> 6) == 100) { if(fail300 && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR){ diff --git a/direct/basic-test/yaffs_ramdisk.c b/direct/basic-test/yaffs_ramdisk.c index d44c3da..0b47adf 100644 --- a/direct/basic-test/yaffs_ramdisk.c +++ b/direct/basic-test/yaffs_ramdisk.c @@ -173,7 +173,7 @@ int yramdisk_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 * yaffs_PackedTags1 pt; memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(pt)); - yaffs_UnpackTags1(tags,&pt); + yaffs_unpack_tags1(tags,&pt); } diff --git a/direct/basic-test/yaffs_ramem2k.c b/direct/basic-test/yaffs_ramem2k.c index b3a8724..f0b7c71 100644 --- a/direct/basic-test/yaffs_ramem2k.c +++ b/direct/basic-test/yaffs_ramem2k.c @@ -257,7 +257,7 @@ int nandemul2k_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 { x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE]; - yaffs_UnpackTags2(tags,(yaffs_PackedTags2 *)x, !dev->param.noTagsECC); + yaffs_unpack_tags2(tags,(yaffs_PackedTags2 *)x, !dev->param.noTagsECC); } return YAFFS_OK; diff --git a/direct/basic-test/yaffscfg.c b/direct/basic-test/yaffscfg.c index a235bb2..7d510b2 100644 --- a/direct/basic-test/yaffscfg.c +++ b/direct/basic-test/yaffscfg.c @@ -25,7 +25,7 @@ #include "yramsim.h" -unsigned yaffs_traceMask = 0xFFFFFFFF; +unsigned yaffs_trace_mask = 0xFFFFFFFF; void yaffsfs_SetError(int err) @@ -87,7 +87,7 @@ static yaffsfs_DeviceConfiguration yaffsfs_config[] = { }; -int yaffs_StartUp(void) +int yaffs_start_up(void) { // Stuff to configure YAFFS // Stuff to initialise anything special (eg lock semaphore). diff --git a/direct/basic-test/yaffscfg2k.c b/direct/basic-test/yaffscfg2k.c index bfd502e..4aa97a3 100644 --- a/direct/basic-test/yaffscfg2k.c +++ b/direct/basic-test/yaffscfg2k.c @@ -29,7 +29,7 @@ #include <errno.h> -unsigned yaffs_traceMask = +unsigned yaffs_trace_mask = YAFFS_TRACE_SCAN | YAFFS_TRACE_GC | @@ -110,7 +110,7 @@ struct yaffs_DeviceStruct ram1Dev; struct yaffs_DeviceStruct flashDev; struct yaffs_DeviceStruct m18_1Dev; -int yaffs_StartUp(void) +int yaffs_start_up(void) { // Stuff to configure YAFFS // Stuff to initialise anything special (eg lock semaphore). @@ -133,7 +133,7 @@ int yaffs_StartUp(void) ram1Dev.param.eraseBlockInNAND = yramdisk_EraseBlockInNAND; ram1Dev.param.initialiseNAND = yramdisk_InitialiseNAND; - yaffs_AddDevice(&ram1Dev); + yaffs_add_device(&ram1Dev); // /M18-1 yaffs1 on M18 nor sim memset(&m18_1Dev,0,sizeof(m18_1Dev)); @@ -154,7 +154,7 @@ int yaffs_StartUp(void) // m18_1Dev.param.disableSoftDelete = 1; - yaffs_AddDevice(&m18_1Dev); + yaffs_add_device(&m18_1Dev); // /yaffs2 yaffs2 file emulation // 2kpage/64chunk per block @@ -181,7 +181,7 @@ int yaffs_StartUp(void) flashDev.param.queryNANDBlock = yflash2_QueryNANDBlock; flashDev.param.enableXattr = 1; - yaffs_AddDevice(&flashDev); + yaffs_add_device(&flashDev); // todo yaffs_initialise(yaffsfs_config); diff --git a/direct/basic-test/yaffsnewcfg.c b/direct/basic-test/yaffsnewcfg.c index fa99342..a3548ef 100644 --- a/direct/basic-test/yaffsnewcfg.c +++ b/direct/basic-test/yaffsnewcfg.c @@ -23,7 +23,7 @@ #include "yaffs_trace.h" #include "yramsim.h" -unsigned yaffs_traceMask = +unsigned yaffs_trace_mask = YAFFS_TRACE_SCAN | YAFFS_TRACE_GC | @@ -96,7 +96,7 @@ void yaffsfs_LocalInitialisation(void) // Configuration -int yaffs_StartUp(void) +int yaffs_start_up(void) { // Stuff to configure YAFFS // Stuff to initialise anything special (eg lock semaphore). diff --git a/direct/basic-test/yramsim.c b/direct/basic-test/yramsim.c index caa1aac..9a7a72b 100644 --- a/direct/basic-test/yramsim.c +++ b/direct/basic-test/yramsim.c @@ -276,5 +276,5 @@ struct yaffs_DeviceStruct *yramsim_CreateRamSim(const YCHAR *name, g->markBlockBad = yramsim_MarkBlockBad, g->privateData = (void *)sim; - return yaffs_AddDeviceFromGeometry(name,g); + return yaffs_add_dev_from_geometry(name,g); } diff --git a/direct/fsx_test/yaffs_fsx.c b/direct/fsx_test/yaffs_fsx.c index 484241b..d3d3149 100644 --- a/direct/fsx_test/yaffs_fsx.c +++ b/direct/fsx_test/yaffs_fsx.c @@ -919,7 +919,7 @@ main(int argc, char **argv) argc -= optind; argv += optind; - yaffs_StartUp(); + yaffs_start_up(); yaffs_mount(BASE_NAME); fname = BASE_NAME "/fsxdata"; diff --git a/direct/python/examples.py b/direct/python/examples.py index 6b0c045..0f42c17 100644 --- a/direct/python/examples.py +++ b/direct/python/examples.py @@ -73,7 +73,7 @@ def yaffs_o_excl_test(dir): root = "/yaffs2" -yaffs_StartUp() +yaffs_start_up() yaffs_mount(root) yaffs_mkdir(root+"/dd",0666) diff --git a/direct/python/yaffs_python_helper.c b/direct/python/yaffs_python_helper.c index 425bcda..01eb357 100644 --- a/direct/python/yaffs_python_helper.c +++ b/direct/python/yaffs_python_helper.c @@ -45,5 +45,5 @@ int yaffs_O_WRONLY(void) { return O_WRONLY;} int yaffs_O_RDWR(void) { return O_RDWR;} int yaffs_O_TRUNC(void) { return O_TRUNC;} -int yaffs_set_trace(unsigned int tm) { return yaffs_traceMask=tm; } -int yaffs_get_trace(void) { return yaffs_traceMask; } +int yaffs_set_trace(unsigned int tm) { return yaffs_trace_mask=tm; } +int yaffs_get_trace(void) { return yaffs_trace_mask; } diff --git a/direct/python/yaffsfs.py b/direct/python/yaffsfs.py index 4d0e5db..48d4129 100644 --- a/direct/python/yaffsfs.py +++ b/direct/python/yaffsfs.py @@ -240,8 +240,8 @@ yaffs_n_handles = ylib.yaffs_n_handles yaffs_n_handles.argtypes = [c_char_p] yaffs_n_handles.restype = c_int -#int yaffs_StartUp(void) -yaffs_StartUp = ylib.yaffs_StartUp -yaffs_StartUp.argtypes = [] -yaffs_StartUp.restype = c_int +#int yaffs_start_up(void) +yaffs_start_up = ylib.yaffs_start_up +yaffs_start_up.argtypes = [] +yaffs_start_up.restype = c_int diff --git a/direct/tests/yaffs_test.c b/direct/tests/yaffs_test.c index 825cf18..b35c750 100644 --- a/direct/tests/yaffs_test.c +++ b/direct/tests/yaffs_test.c @@ -45,7 +45,7 @@ int n_cycles = -1; int fuzz_test=0; -int yaffs_test_maxMallocs; +int yaffs_test_max_mallocs; extern int ops_multiplier; @@ -227,7 +227,7 @@ int main(int argc, char **argv) n_cycles = atoi(optarg); break; case 't': - yaffs_traceMask = strtol(optarg,NULL,0); + yaffs_trace_mask = strtol(optarg,NULL,0); break; case 'z':fuzz_test=1; break; @@ -239,7 +239,7 @@ int main(int argc, char **argv) argv += optind; if(random_mallocs){ - yaffs_test_maxMallocs = 0xFFF & random_seed; + yaffs_test_max_mallocs = 0xFFF & random_seed; } if(argc == 1) { @@ -257,7 +257,7 @@ int main(int argc, char **argv) simulate_power_failure ? "power_fail" : "", random_seed, n_cycles); - yaffs_StartUp(); + yaffs_start_up(); result = yaffs_mount(mount_point); if(result < 0){ printf("Mount of %s failed\n",mount_point); diff --git a/direct/yaffs_flashif.c b/direct/yaffs_flashif.c index 0a46739..b7ee482 100644 --- a/direct/yaffs_flashif.c +++ b/direct/yaffs_flashif.c @@ -160,7 +160,7 @@ int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *da { yaffs_PackedTags pt; memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(yaffs_PackedTags)); - yaffs_UnpackTags(tags,&pt); + yaffs_unpack_tags(tags,&pt); } return YAFFS_OK; diff --git a/direct/yaffs_nandif.c b/direct/yaffs_nandif.c index 26d4f69..b0c9bd8 100644 --- a/direct/yaffs_nandif.c +++ b/direct/yaffs_nandif.c @@ -93,7 +93,7 @@ int ynandif_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, if(!data) { localData = 1; - data = yaffs_GetTempBuffer(dev,__LINE__); + data = yaffs_get_temp_buffer(dev,__LINE__); } spare = NULL; spareSize = 0; @@ -113,12 +113,12 @@ int ynandif_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, if(tags){ yaffs_PackedTags2TagsPart * pt2tp; pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk]; - yaffs_UnpackTags2TagsPart(tags,pt2tp); + yaffs_unpack_tags2tags_part(tags,pt2tp); } } else { if (tags){ - yaffs_UnpackTags2(tags, &pt,!dev->param.noTagsECC); + yaffs_unpack_tags2(tags, &pt,!dev->param.noTagsECC); } } @@ -134,7 +134,7 @@ int ynandif_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, } if(localData) - yaffs_ReleaseTempBuffer(dev,data,__LINE__); + yaffs_release_temp_buffer(dev,data,__LINE__); return retval; } @@ -213,7 +213,7 @@ int ynandif_DeinitialiseNAND(yaffs_Device *dev) struct yaffs_DeviceStruct * - yaffs_AddDeviceFromGeometry(const YCHAR *name, + yaffs_add_dev_from_geometry(const YCHAR *name, const ynandif_Geometry *geometry) { YCHAR *clonedName = YMALLOC(sizeof(YCHAR) * (yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH)+1)); @@ -242,7 +242,7 @@ struct yaffs_DeviceStruct * dev->param.nReservedBlocks = 5; dev->driverContext = (void *)geometry; - yaffs_AddDevice(dev); + yaffs_add_device(dev); return dev; } diff --git a/direct/yaffs_nandif.h b/direct/yaffs_nandif.h index cf4562c..9009b62 100644 --- a/direct/yaffs_nandif.h +++ b/direct/yaffs_nandif.h @@ -55,7 +55,7 @@ typedef struct { } ynandif_Geometry; struct yaffs_DeviceStruct * - yaffs_AddDeviceFromGeometry(const YCHAR *name, + yaffs_add_dev_from_geometry(const YCHAR *name, const ynandif_Geometry *geometry); #if 0 diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index d87bc80..7a53aa7 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -123,7 +123,7 @@ static int yaffsfs_FindInodeIdForObject(yaffs_Object *obj) int ret = -1; if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); /* Look for it in open inode table*/ for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){ @@ -144,7 +144,7 @@ static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj) yaffsfs_Inode *in = NULL; if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); ret = yaffsfs_FindInodeIdForObject(obj); @@ -183,7 +183,7 @@ static void yaffsfs_ReleaseInode(yaffsfs_Inode *in) obj = in->iObj; if(obj->unlinked) - yaffs_DeleteObject(obj); + yaffs_del_obj(obj); obj->myInode = NULL; in->iObj = NULL; @@ -227,7 +227,7 @@ static int yaffsfs_GetNewHandle(void) } /* - * yaffs_GetHandle + * yaffs_get_handle * Increase use of handle when reading/writing a file */ static int yaffsfs_GetHandle(int handle) @@ -241,7 +241,7 @@ static int yaffsfs_GetHandle(int handle) } /* - * yaffs_PutHandle + * yaffs_put_handle * Let go of a handle when closing a file or aborting an open or * ending a read or write. */ @@ -498,7 +498,7 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir, else if(yaffs_strcmp(str,_Y("..")) == 0) dir = dir->parent; else{ - dir = yaffs_FindObjectByName(dir,str); + dir = yaffs_find_by_name(dir,str); while(dir && dir->variantType == YAFFS_OBJECT_TYPE_SYMLINK) dir = yaffsfs_FollowLink(dir,symDepth); @@ -530,7 +530,7 @@ static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const Y dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth); if(dir && *name) - return yaffs_FindObjectByName(dir,name); + return yaffs_find_by_name(dir,name); return dir; } @@ -609,7 +609,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) obj = yaffsfs_FollowLink(obj,symDepth++); if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); if(obj && obj->variantType != YAFFS_OBJECT_TYPE_FILE && @@ -693,7 +693,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) yaffsfs_SetError(-EINVAL); errorReported = 1; } else if(dir) - obj = yaffs_MknodFile(dir,name,mode,0,0); + obj = yaffs_create_file(dir,name,mode,0,0); else { yaffsfs_SetError(-ENOTDIR); errorReported = 1; @@ -722,7 +722,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) obj->myInode = (void*) &yaffsfs_inode[inodeId]; if((oflag & O_TRUNC) && h->writing) - yaffs_ResizeFile(obj,0); + yaffs_resize_file(obj,0); } else { yaffsfs_PutHandle(handle); if(!errorReported) { @@ -754,7 +754,7 @@ int yaffs_Dofsync(int fd,int datasync) if(h && h->useCount > 0) /* flush the file */ - yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,datasync); + yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync); else { /* bad handle */ yaffsfs_SetError(-EBADF); @@ -792,7 +792,7 @@ int yaffs_close(int fd) if(h && h->useCount > 0) { /* clean up */ - yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,0); + yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,0); yaffsfs_PutHandle(fd); retVal = 0; } else { @@ -836,8 +836,8 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off pos = startPos; - if(yaffs_GetObjectFileLength(obj) > pos) - maxRead = yaffs_GetObjectFileLength(obj) - pos; + if(yaffs_get_obj_length(obj) > pos) + maxRead = yaffs_get_obj_length(obj) - pos; else maxRead = 0; @@ -851,7 +851,7 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); if(nToRead > nbyte) nToRead = nbyte; - nRead = yaffs_ReadDataFromFile(obj,buf,pos,nToRead); + nRead = yaffs_file_rd(obj,buf,pos,nToRead); if(nRead > 0){ totalRead += nRead; @@ -925,7 +925,7 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, totalWritten=-1; } else if( h && obj){ if(h->append) - startPos = yaffs_GetObjectFileLength(obj); + startPos = yaffs_get_obj_length(obj); else if(isPwrite) startPos = offset; else @@ -938,7 +938,7 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, if(nToWrite > nbyte) nToWrite = nbyte; - nWritten = yaffs_WriteDataToFile(obj,buf,pos,nToWrite,writeThrough); + nWritten = yaffs_wr_file(obj,buf,pos,nToWrite,writeThrough); if(nWritten > 0){ totalWritten += nWritten; pos += nWritten; @@ -997,7 +997,7 @@ int yaffs_truncate(const YCHAR *path,off_t newSize) obj = yaffsfs_FindObject(NULL,path,0); if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); if(!obj) yaffsfs_SetError(-ENOENT); @@ -1006,7 +1006,7 @@ int yaffs_truncate(const YCHAR *path,off_t newSize) else if(obj->myDev->readOnly) yaffsfs_SetError(-EINVAL); else - result = yaffs_ResizeFile(obj,newSize); + result = yaffs_resize_file(obj,newSize); yaffsfs_Unlock(); @@ -1031,7 +1031,7 @@ int yaffs_ftruncate(int fd, off_t newSize) yaffsfs_SetError(-EINVAL); else /* resize the file */ - result = yaffs_ResizeFile(obj,newSize); + result = yaffs_resize_file(obj,newSize); yaffsfs_Unlock(); @@ -1062,7 +1062,7 @@ off_t yaffs_lseek(int fd, off_t offset, int whence) pos = (h->position + offset); } else if(whence == SEEK_END) { - fSize = yaffs_GetObjectFileLength(obj); + fSize = yaffs_get_obj_length(obj); if(fSize >= 0 && (fSize + offset) >= 0) pos = fSize + offset; } @@ -1173,7 +1173,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) } if(renameAllowed) - result = yaffs_RenameObject(olddir,oldname,newdir,newname); + result = yaffs_rename_obj(olddir,oldname,newdir,newname); yaffsfs_Unlock(); @@ -1186,7 +1186,7 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf) int retVal = -1; if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); if(obj && buf){ buf->st_dev = (int)obj->myDev->osContext; @@ -1200,11 +1200,11 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf) else if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) buf->st_mode |= S_IFREG; - buf->st_nlink = yaffs_GetObjectLinkCount(obj); + buf->st_nlink = yaffs_get_obj_link_count(obj); buf->st_uid = 0; buf->st_gid = 0;; buf->st_rdev = obj->yst_rdev; - buf->st_size = yaffs_GetObjectFileLength(obj); + buf->st_size = yaffs_get_obj_length(obj); buf->st_blksize = obj->myDev->nDataBytesPerChunk; buf->st_blocks = (buf->st_size + buf->st_blksize -1)/buf->st_blksize; #if CONFIG_YAFFS_WINCE @@ -1295,7 +1295,7 @@ static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *da obj = yaffsfs_FollowLink(obj,0); if(obj) { - retVal = yaffs_SetXAttribute(obj,name,data,size,flags); + retVal = yaffs_set_xattrib(obj,name,data,size,flags); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; @@ -1332,7 +1332,7 @@ int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int fl obj = yaffsfs_GetHandleObject(fd); if(obj) { - retVal = yaffs_SetXAttribute(obj,name,data,size,flags); + retVal = yaffs_set_xattrib(obj,name,data,size,flags); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; @@ -1359,7 +1359,7 @@ static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, in obj = yaffsfs_FollowLink(obj,0); if(obj) { - retVal = yaffs_GetXAttribute(obj,name,data,size); + retVal = yaffs_get_xattrib(obj,name,data,size); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; @@ -1395,7 +1395,7 @@ int yaffs_fgetxattr(int fd, const char *name, void *data, int size) obj = yaffsfs_GetHandleObject(fd); if(obj) { - retVal = yaffs_GetXAttribute(obj,name,data,size); + retVal = yaffs_get_xattrib(obj,name,data,size); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; @@ -1422,7 +1422,7 @@ static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follo obj = yaffsfs_FollowLink(obj,0); if(obj) { - retVal = yaffs_ListXAttributes(obj, data,size); + retVal = yaffs_list_xattrib(obj, data,size); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; @@ -1457,7 +1457,7 @@ int yaffs_flistxattr(int fd, char *data, int size) obj = yaffsfs_GetHandleObject(fd); if(obj) { - retVal = yaffs_ListXAttributes(obj,data,size); + retVal = yaffs_list_xattrib(obj,data,size); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; @@ -1484,7 +1484,7 @@ static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow) obj = yaffsfs_FollowLink(obj,0); if(obj) { - retVal = yaffs_RemoveXAttribute(obj,name); + retVal = yaffs_remove_xattrib(obj,name); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; @@ -1519,7 +1519,7 @@ int yaffs_fremovexattr(int fd, const char *name) obj = yaffsfs_GetHandleObject(fd); if(obj){ - retVal = yaffs_RemoveXAttribute(obj,name); + retVal = yaffs_remove_xattrib(obj,name); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; @@ -1599,7 +1599,7 @@ int yaffs_set_wince_times(int fd, } obj->dirty = 1; - result = yaffs_FlushFile(obj,0,0); + result = yaffs_flush_file(obj,0,0); retVal = 0; } else /* bad handle */ @@ -1618,12 +1618,12 @@ static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode) int result = -1; if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); if(obj) { obj->yst_mode = mode; obj->dirty = 1; - result = yaffs_FlushFile(obj,0,0); + result = yaffs_flush_file(obj,0,0); } return result == YAFFS_OK ? 0 : -1; @@ -1727,13 +1727,13 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) yaffsfs_SetError(-EINVAL); } else { if(parent) - dir = yaffs_MknodDirectory(parent,name,mode,0,0); + dir = yaffs_create_dir(parent,name,mode,0,0); if(dir) retVal = 0; else { if(!parent) yaffsfs_SetError(-ENOENT); /* missing path */ - else if (yaffs_FindObjectByName(parent,name)) + else if (yaffs_find_by_name(parent,name)) yaffsfs_SetError(-EEXIST); /* the name already exists */ else yaffsfs_SetError(-ENOSPC); /* just assume no space */ @@ -1771,7 +1771,7 @@ int yaffs_mount2(const YCHAR *path,int readOnly) if(dev){ if(!dev->isMounted){ dev->readOnly = readOnly ? 1 : 0; - result = yaffs_GutsInitialise(dev); + result = yaffs_guts_initialise(dev); if(result == YAFFS_FAIL) /* todo error - mount failed */ yaffsfs_SetError(-ENOMEM); @@ -1806,8 +1806,8 @@ int yaffs_sync(const YCHAR *path) if(dev){ if(dev->isMounted){ - yaffs_FlushEntireDeviceCache(dev); - yaffs_CheckpointSave(dev); + yaffs_flush_whole_cache(dev); + yaffs_checkpoint_save(dev); retVal = 0; } else @@ -1836,7 +1836,7 @@ int yaffs_remount(const YCHAR *path, int force, int readOnly) int i; int inUse; - yaffs_FlushEntireDeviceCache(dev); + yaffs_flush_whole_cache(dev); for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){ if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev) @@ -1845,7 +1845,7 @@ int yaffs_remount(const YCHAR *path, int force, int readOnly) if(!inUse || force){ if(readOnly) - yaffs_CheckpointSave(dev); + yaffs_checkpoint_save(dev); dev->readOnly = readOnly ? 1 : 0; retVal = 0; } else @@ -1876,8 +1876,8 @@ int yaffs_unmount2(const YCHAR *path, int force) int i; int inUse; - yaffs_FlushEntireDeviceCache(dev); - yaffs_CheckpointSave(dev); + yaffs_flush_whole_cache(dev); + yaffs_checkpoint_save(dev); for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){ if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev) @@ -1885,7 +1885,7 @@ int yaffs_unmount2(const YCHAR *path, int force) } if(!inUse || force){ - yaffs_Deinitialise(dev); + yaffs_deinitialise(dev); retVal = 0; } else @@ -1920,7 +1920,7 @@ loff_t yaffs_freespace(const YCHAR *path) yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); if(dev && dev->isMounted){ - retVal = yaffs_GetNumberOfFreeChunks(dev); + retVal = yaffs_get_n_free_chunks(dev); retVal *= dev->nDataBytesPerChunk; } else @@ -1972,7 +1972,7 @@ int yaffs_inodecount(const YCHAR *path) } -void yaffs_AddDevice(yaffs_Device *dev) +void yaffs_add_device(yaffs_Device *dev) { dev->isMounted = 0; dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback; @@ -1983,7 +1983,7 @@ void yaffs_AddDevice(yaffs_Device *dev) ylist_add(&dev->devList,&yaffsfs_deviceList); } -void yaffs_RemoveDevice(yaffs_Device *dev) +void yaffs_remove_device(yaffs_Device *dev) { ylist_del_init(&dev->devList); } @@ -2126,10 +2126,10 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp) if(dsc && dsc->magic == YAFFS_MAGIC){ yaffsfs_SetError(0); if(dsc->nextReturn){ - dsc->de.d_ino = yaffs_GetEquivalentObject(dsc->nextReturn)->objectId; + dsc->de.d_ino = yaffs_get_equivalent_obj(dsc->nextReturn)->objectId; dsc->de.d_dont_use = (unsigned)dsc->nextReturn; dsc->de.d_off = dsc->offset++; - yaffs_GetObjectName(dsc->nextReturn,dsc->de.d_name,NAME_MAX); + yaffs_get_obj_name(dsc->nextReturn,dsc->de.d_name,NAME_MAX); if(yaffs_strnlen(dsc->de.d_name,NAME_MAX+1) == 0) { /* this should not happen! */ @@ -2190,7 +2190,7 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) if(parent && parent->myDev->readOnly) yaffsfs_SetError(-EINVAL); else if(parent){ - obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath); + obj = yaffs_create_symlink(parent,name,mode,0,0,oldpath); if(obj) retVal = 0; else{ @@ -2316,12 +2316,12 @@ int yaffs_n_handles(const YCHAR *path) obj = yaffsfs_FindObject(NULL,path,0); if(obj) - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); return yaffsfs_CountHandles(obj); } -int yaffs_DumpDevStruct(const YCHAR *path) +int yaffs_dump_dev(const YCHAR *path) { #if 0 YCHAR *rest; diff --git a/direct/yaffsfs.h b/direct/yaffsfs.h index 36b7e5a..2a450e9 100644 --- a/direct/yaffsfs.h +++ b/direct/yaffsfs.h @@ -167,14 +167,14 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int shareMode) ; struct yaffs_DeviceStruct; -void yaffs_AddDevice(struct yaffs_DeviceStruct *dev); +void yaffs_add_device(struct yaffs_DeviceStruct *dev); -int yaffs_StartUp(void); +int yaffs_start_up(void); /* Function only for debugging */ void * yaffs_getdev(const YCHAR *path); -int yaffs_DumpDevStruct(const YCHAR *path); +int yaffs_dump_dev(const YCHAR *path); #endif diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h index 677ab8a..824ce20 100644 --- a/direct/ydirectenv.h +++ b/direct/ydirectenv.h @@ -84,7 +84,7 @@ #define YAFFS_ROOT_MODE 0666 #define YAFFS_LOSTNFOUND_MODE 0666 -#define yaffs_SumCompare(x,y) ((x) == (y)) +#define yaffs_sum_cmp(x,y) ((x) == (y)) #define yaffs_strcmp(a,b) strcmp(a,b) #include "yaffsfs.h" diff --git a/patches/yaffs_mtdif2.c b/patches/yaffs_mtdif2.c index 8f73ac4..6d95651 100644 --- a/patches/yaffs_mtdif2.c +++ b/patches/yaffs_mtdif2.c @@ -185,7 +185,7 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, } if (tags) - yaffs_UnpackTags2(tags, &pt); + yaffs_unpack_tags2(tags, &pt); if (retval == 0) return YAFFS_OK; diff --git a/utils/mkyaffs2image.c b/utils/mkyaffs2image.c index b5f9606..f40a657 100644 --- a/utils/mkyaffs2image.c +++ b/utils/mkyaffs2image.c @@ -37,7 +37,7 @@ #include "yaffs_tagsvalidity.h" #include "yaffs_packedtags2.h" -unsigned yaffs_traceMask=0; +unsigned yaffs_trace_mask=0; #define MAX_OBJECTS 10000 @@ -190,7 +190,7 @@ static int write_chunk(__u8 *data, __u32 objId, __u32 chunkId, __u32 nBytes) if (write(outFile,data,chunkSize) != chunkSize) fatal("write"); - yaffs_InitialiseTags(&t); + yaffs_init_tags(&t); t.chunkId = chunkId; // t.serialNumber = 0; diff --git a/utils/mkyaffsimage.c b/utils/mkyaffsimage.c index e8434e8..b7173eb 100644 --- a/utils/mkyaffsimage.c +++ b/utils/mkyaffsimage.c @@ -113,7 +113,7 @@ static int find_obj_in_list(dev_t dev, ino_t ino) } // NCB added 10/9/2002 -static __u16 yaffs_CalcNameSum(const char *name) +static __u16 yaffs_calc_name_sum(const char *name) { __u16 sum = 0; __u16 i = 1; @@ -130,13 +130,13 @@ static __u16 yaffs_CalcNameSum(const char *name) } -static void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare) +static void yaffs_calc_ecc(const __u8 *data, yaffs_Spare *spare) { - yaffs_ECCCalculate(data , spare->ecc1); - yaffs_ECCCalculate(&data[256] , spare->ecc2); + yaffs_ecc_cacl(data , spare->ecc1); + yaffs_ecc_cacl(&data[256] , spare->ecc2); } -static void yaffs_CalcTagsECC(yaffs_Tags *tags) +static void yaffs_calc_tags_ecc(yaffs_Tags *tags) { // Todo don't do anything yet. Need to calculate ecc unsigned char *b = ((yaffs_TagsUnion *)tags)->asBytes; @@ -181,11 +181,11 @@ static void yaffs_CalcTagsECC(yaffs_Tags *tags) b[7] |= ((ecc & 0x3F) << 2); } } -static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr) +static void yaffs_load_tags_to_spare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr) { yaffs_TagsUnion *tu = (yaffs_TagsUnion *)tagsPtr; - //yaffs_CalcTagsECC(tagsPtr); + //yaffs_calc_tags_ecc(tagsPtr); sparePtr->tagByte0 = tu->asBytes[0]; sparePtr->tagByte1 = tu->asBytes[1]; @@ -249,9 +249,9 @@ static int write_chunk(__u8 *data, __u32 objId, __u32 chunkId, __u32 nBytes) little_to_big_endian(&t); } - yaffs_CalcTagsECC(&t); - yaffs_LoadTagsIntoSpare(&s,&t); - yaffs_CalcECC(data,&s); + yaffs_calc_tags_ecc(&t); + yaffs_load_tags_to_spare(&s,&t); + yaffs_calc_ecc(data,&s); nPages++; diff --git a/yaffs_allocator.c b/yaffs_allocator.c index ab44bc7..41200ee 100644 --- a/yaffs_allocator.c +++ b/yaffs_allocator.c @@ -21,45 +21,45 @@ #ifdef CONFIG_YAFFS_YMALLOC_ALLOCATOR -void yaffs_DeinitialiseRawTnodesAndObjects(yaffs_Device *dev) +void yaffs_deinit_raw_tnodes_and_objs(yaffs_Device *dev) { dev = dev; } -void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev) +void yaffs_init_raw_tnodes_and_objs(yaffs_Device *dev) { dev = dev; } -yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev) +yaffs_Tnode *yaffs_alloc_raw_tnode(yaffs_Device *dev) { return (yaffs_Tnode *)YMALLOC(dev->tnodeSize); } -void yaffs_FreeRawTnode(yaffs_Device *dev, yaffs_Tnode *tn) +void yaffs_free_raw_tnode(yaffs_Device *dev, yaffs_Tnode *tn) { dev = dev; YFREE(tn); } -void yaffs_InitialiseRawObjects(yaffs_Device *dev) +void yaffs_init_raw_objs(yaffs_Device *dev) { dev = dev; } -void yaffs_DeinitialiseRawObjects(yaffs_Device *dev) +void yaffs_deinit_raw_objs(yaffs_Device *dev) { dev = dev; } -yaffs_Object *yaffs_AllocateRawObject(yaffs_Device *dev) +yaffs_Object *yaffs_alloc_raw_obj(yaffs_Device *dev) { dev = dev; return (yaffs_Object *) YMALLOC(sizeof(yaffs_Object)); } -void yaffs_FreeRawObject(yaffs_Device *dev, yaffs_Object *obj) +void yaffs_free_raw_obj(yaffs_Device *dev, yaffs_Object *obj) { dev = dev; @@ -99,7 +99,7 @@ struct yaffs_AllocatorStruct { typedef struct yaffs_AllocatorStruct yaffs_Allocator; -static void yaffs_DeinitialiseRawTnodes(yaffs_Device *dev) +static void yaffs_deinit_raw_tnodes(yaffs_Device *dev) { yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator; @@ -125,7 +125,7 @@ static void yaffs_DeinitialiseRawTnodes(yaffs_Device *dev) allocator->nTnodesCreated = 0; } -static void yaffs_InitialiseRawTnodes(yaffs_Device *dev) +static void yaffs_init_raw_tnodes(yaffs_Device *dev) { yaffs_Allocator *allocator = dev->allocator; @@ -138,7 +138,7 @@ static void yaffs_InitialiseRawTnodes(yaffs_Device *dev) YBUG(); } -static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes) +static int yaffs_create_tnodes(yaffs_Device *dev, int nTnodes) { yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator; int i; @@ -205,7 +205,7 @@ static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes) } -yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev) +yaffs_Tnode *yaffs_alloc_raw_tnode(yaffs_Device *dev) { yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator; yaffs_Tnode *tn = NULL; @@ -217,7 +217,7 @@ yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev) /* If there are none left make more */ if (!allocator->freeTnodes) - yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES); + yaffs_create_tnodes(dev, YAFFS_ALLOCATION_NTNODES); if (allocator->freeTnodes) { tn = allocator->freeTnodes; @@ -229,7 +229,7 @@ yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev) } /* FreeTnode frees up a tnode and puts it back on the free list */ -void yaffs_FreeRawTnode(yaffs_Device *dev, yaffs_Tnode *tn) +void yaffs_free_raw_tnode(yaffs_Device *dev, yaffs_Tnode *tn) { yaffs_Allocator *allocator = dev->allocator; @@ -248,7 +248,7 @@ void yaffs_FreeRawTnode(yaffs_Device *dev, yaffs_Tnode *tn) -static void yaffs_InitialiseRawObjects(yaffs_Device *dev) +static void yaffs_init_raw_objs(yaffs_Device *dev) { yaffs_Allocator *allocator = dev->allocator; @@ -260,7 +260,7 @@ static void yaffs_InitialiseRawObjects(yaffs_Device *dev) YBUG(); } -static void yaffs_DeinitialiseRawObjects(yaffs_Device *dev) +static void yaffs_deinit_raw_objs(yaffs_Device *dev) { yaffs_Allocator *allocator = dev->allocator; yaffs_ObjectList *tmp; @@ -284,7 +284,7 @@ static void yaffs_DeinitialiseRawObjects(yaffs_Device *dev) } -static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects) +static int yaffs_create_free_objs(yaffs_Device *dev, int nObjects) { yaffs_Allocator *allocator = dev->allocator; @@ -338,7 +338,7 @@ static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects) return YAFFS_OK; } -yaffs_Object *yaffs_AllocateRawObject(yaffs_Device *dev) +yaffs_Object *yaffs_alloc_raw_obj(yaffs_Device *dev) { yaffs_Object *obj = NULL; yaffs_Allocator *allocator = dev->allocator; @@ -350,7 +350,7 @@ yaffs_Object *yaffs_AllocateRawObject(yaffs_Device *dev) /* If there are none left make more */ if (!allocator->freeObjects) - yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS); + yaffs_create_free_objs(dev, YAFFS_ALLOCATION_NOBJECTS); if (allocator->freeObjects) { obj = allocator->freeObjects; @@ -363,7 +363,7 @@ yaffs_Object *yaffs_AllocateRawObject(yaffs_Device *dev) } -void yaffs_FreeRawObject(yaffs_Device *dev, yaffs_Object *obj) +void yaffs_free_raw_obj(yaffs_Device *dev, yaffs_Object *obj) { yaffs_Allocator *allocator = dev->allocator; @@ -378,11 +378,11 @@ void yaffs_FreeRawObject(yaffs_Device *dev, yaffs_Object *obj) } } -void yaffs_DeinitialiseRawTnodesAndObjects(yaffs_Device *dev) +void yaffs_deinit_raw_tnodes_and_objs(yaffs_Device *dev) { if(dev->allocator){ - yaffs_DeinitialiseRawTnodes(dev); - yaffs_DeinitialiseRawObjects(dev); + yaffs_deinit_raw_tnodes(dev); + yaffs_deinit_raw_objs(dev); YFREE(dev->allocator); dev->allocator=NULL; @@ -390,7 +390,7 @@ void yaffs_DeinitialiseRawTnodesAndObjects(yaffs_Device *dev) YBUG(); } -void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev) +void yaffs_init_raw_tnodes_and_objs(yaffs_Device *dev) { yaffs_Allocator *allocator; @@ -398,8 +398,8 @@ void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev) allocator = YMALLOC(sizeof(yaffs_Allocator)); if(allocator){ dev->allocator = allocator; - yaffs_InitialiseRawTnodes(dev); - yaffs_InitialiseRawObjects(dev); + yaffs_init_raw_tnodes(dev); + yaffs_init_raw_objs(dev); } } else YBUG(); diff --git a/yaffs_allocator.h b/yaffs_allocator.h index b0a5d11..1212081 100644 --- a/yaffs_allocator.h +++ b/yaffs_allocator.h @@ -18,13 +18,13 @@ #include "yaffs_guts.h" -void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev); -void yaffs_DeinitialiseRawTnodesAndObjects(yaffs_Device *dev); +void yaffs_init_raw_tnodes_and_objs(yaffs_Device *dev); +void yaffs_deinit_raw_tnodes_and_objs(yaffs_Device *dev); -yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev); -void yaffs_FreeRawTnode(yaffs_Device *dev, yaffs_Tnode *tn); +yaffs_Tnode *yaffs_alloc_raw_tnode(yaffs_Device *dev); +void yaffs_free_raw_tnode(yaffs_Device *dev, yaffs_Tnode *tn); -yaffs_Object *yaffs_AllocateRawObject(yaffs_Device *dev); -void yaffs_FreeRawObject(yaffs_Device *dev, yaffs_Object *obj); +yaffs_Object *yaffs_alloc_raw_obj(yaffs_Device *dev); +void yaffs_free_raw_obj(yaffs_Device *dev, yaffs_Object *obj); #endif diff --git a/yaffs_bitmap.c b/yaffs_bitmap.c index c7e9e8c..a24dbb7 100644 --- a/yaffs_bitmap.c +++ b/yaffs_bitmap.c @@ -29,7 +29,7 @@ static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk) (dev->chunkBitmapStride * (blk - dev->internalStartBlock)); } -void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk) +void yaffs_verify_chunk_bit_id(yaffs_Device *dev, int blk, int chunk) { if (blk < dev->internalStartBlock || blk > dev->internalEndBlock || chunk < 0 || chunk >= dev->param.nChunksPerBlock) { @@ -40,40 +40,40 @@ void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk) } } -void yaffs_ClearChunkBits(yaffs_Device *dev, int blk) +void yaffs_clear_chunk_bits(yaffs_Device *dev, int blk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); memset(blkBits, 0, dev->chunkBitmapStride); } -void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk) +void yaffs_clear_chunk_bit(yaffs_Device *dev, int blk, int chunk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); - yaffs_VerifyChunkBitId(dev, blk, chunk); + yaffs_verify_chunk_bit_id(dev, blk, chunk); blkBits[chunk / 8] &= ~(1 << (chunk & 7)); } -void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk) +void yaffs_set_chunk_bit(yaffs_Device *dev, int blk, int chunk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); - yaffs_VerifyChunkBitId(dev, blk, chunk); + yaffs_verify_chunk_bit_id(dev, blk, chunk); blkBits[chunk / 8] |= (1 << (chunk & 7)); } -int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk) +int yaffs_check_chunk_bit(yaffs_Device *dev, int blk, int chunk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); - yaffs_VerifyChunkBitId(dev, blk, chunk); + yaffs_verify_chunk_bit_id(dev, blk, chunk); return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0; } -int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk) +int yaffs_still_some_chunks(yaffs_Device *dev, int blk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); int i; @@ -85,7 +85,7 @@ int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk) return 0; } -int yaffs_CountChunkBits(yaffs_Device *dev, int blk) +int yaffs_count_chunk_bits(yaffs_Device *dev, int blk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); int i; diff --git a/yaffs_bitmap.h b/yaffs_bitmap.h index a0ad130..d693b31 100644 --- a/yaffs_bitmap.h +++ b/yaffs_bitmap.h @@ -20,12 +20,12 @@ #include "yaffs_guts.h" -void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk); -void yaffs_ClearChunkBits(yaffs_Device *dev, int blk); -void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk); -void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk); -int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk); -int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk); -int yaffs_CountChunkBits(yaffs_Device *dev, int blk); +void yaffs_verify_chunk_bit_id(yaffs_Device *dev, int blk, int chunk); +void yaffs_clear_chunk_bits(yaffs_Device *dev, int blk); +void yaffs_clear_chunk_bit(yaffs_Device *dev, int blk, int chunk); +void yaffs_set_chunk_bit(yaffs_Device *dev, int blk, int chunk); +int yaffs_check_chunk_bit(yaffs_Device *dev, int blk, int chunk); +int yaffs_still_some_chunks(yaffs_Device *dev, int blk); +int yaffs_count_chunk_bits(yaffs_Device *dev, int blk); #endif diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c index 16c9f84..c047caf 100644 --- a/yaffs_checkptrw.c +++ b/yaffs_checkptrw.c @@ -14,7 +14,7 @@ #include "yaffs_checkptrw.h" #include "yaffs_getblockinfo.h" -static int yaffs2_CheckpointSpaceOk(yaffs_Device *dev) +static int yaffs2_checkpt_space_ok(yaffs_Device *dev) { int blocksAvailable = dev->nErasedBlocks - dev->param.nReservedBlocks; @@ -26,7 +26,7 @@ static int yaffs2_CheckpointSpaceOk(yaffs_Device *dev) } -static int yaffs2_CheckpointErase(yaffs_Device *dev) +static int yaffs_checkpt_erase(yaffs_Device *dev) { int i; @@ -36,7 +36,7 @@ static int yaffs2_CheckpointErase(yaffs_Device *dev) dev->internalStartBlock, dev->internalEndBlock)); for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) { - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i); + yaffs_BlockInfo *bi = yaffs_get_block_info(dev, i); if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i)); @@ -59,7 +59,7 @@ static int yaffs2_CheckpointErase(yaffs_Device *dev) } -static void yaffs2_CheckpointFindNextErasedBlock(yaffs_Device *dev) +static void yaffs2_checkpt_find_erased_block(yaffs_Device *dev) { int i; int blocksAvailable = dev->nErasedBlocks - dev->param.nReservedBlocks; @@ -72,7 +72,7 @@ static void yaffs2_CheckpointFindNextErasedBlock(yaffs_Device *dev) blocksAvailable > 0) { for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) { - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i); + yaffs_BlockInfo *bi = yaffs_get_block_info(dev, i); if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) { dev->checkpointNextBlock = i + 1; dev->checkpointCurrentBlock = i; @@ -87,7 +87,7 @@ static void yaffs2_CheckpointFindNextErasedBlock(yaffs_Device *dev) dev->checkpointCurrentBlock = -1; } -static void yaffs2_CheckpointFindNextCheckpointBlock(yaffs_Device *dev) +static void yaffs2_checkpt_find_block(yaffs_Device *dev) { int i; yaffs_ExtendedTags tags; @@ -123,7 +123,7 @@ static void yaffs2_CheckpointFindNextCheckpointBlock(yaffs_Device *dev) } -int yaffs2_CheckpointOpen(yaffs_Device *dev, int forWriting) +int yaffs2_checkpt_open(yaffs_Device *dev, int forWriting) { @@ -136,7 +136,7 @@ int yaffs2_CheckpointOpen(yaffs_Device *dev, int forWriting) !dev->param.markNANDBlockBad) return 0; - if (forWriting && !yaffs2_CheckpointSpaceOk(dev)) + if (forWriting && !yaffs2_checkpt_space_ok(dev)) return 0; if (!dev->checkpointBuffer) @@ -157,7 +157,7 @@ int yaffs2_CheckpointOpen(yaffs_Device *dev, int forWriting) if (forWriting) { memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk); dev->checkpointByteOffset = 0; - return yaffs2_CheckpointErase(dev); + return yaffs_checkpt_erase(dev); } else { int i; /* Set to a value that will kick off a read */ @@ -177,7 +177,7 @@ int yaffs2_CheckpointOpen(yaffs_Device *dev, int forWriting) return 1; } -int yaffs2_GetCheckpointSum(yaffs_Device *dev, __u32 *sum) +int yaffs2_get_checkpt_sum(yaffs_Device *dev, __u32 *sum) { __u32 compositeSum; compositeSum = (dev->checkpointSum << 8) | (dev->checkpointXor & 0xFF); @@ -185,7 +185,7 @@ int yaffs2_GetCheckpointSum(yaffs_Device *dev, __u32 *sum) return 1; } -static int yaffs2_CheckpointFlushBuffer(yaffs_Device *dev) +static int yaffs2_checkpt_flush_buffer(yaffs_Device *dev) { int chunk; int realignedChunk; @@ -193,7 +193,7 @@ static int yaffs2_CheckpointFlushBuffer(yaffs_Device *dev) yaffs_ExtendedTags tags; if (dev->checkpointCurrentBlock < 0) { - yaffs2_CheckpointFindNextErasedBlock(dev); + yaffs2_checkpt_find_erased_block(dev); dev->checkpointCurrentChunk = 0; } @@ -208,7 +208,7 @@ static int yaffs2_CheckpointFlushBuffer(yaffs_Device *dev) if (dev->checkpointCurrentChunk == 0) { /* First chunk we write for the block? Set block state to checkpoint */ - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock); + yaffs_BlockInfo *bi = yaffs_get_block_info(dev, dev->checkpointCurrentBlock); bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT; dev->blocksInCheckpoint++; } @@ -238,7 +238,7 @@ static int yaffs2_CheckpointFlushBuffer(yaffs_Device *dev) } -int yaffs2_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes) +int yaffs2_checkpt_wr(yaffs_Device *dev, const void *data, int nBytes) { int i = 0; int ok = 1; @@ -267,13 +267,13 @@ int yaffs2_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes) if (dev->checkpointByteOffset < 0 || dev->checkpointByteOffset >= dev->nDataBytesPerChunk) - ok = yaffs2_CheckpointFlushBuffer(dev); + ok = yaffs2_checkpt_flush_buffer(dev); } return i; } -int yaffs2_CheckpointRead(yaffs_Device *dev, void *data, int nBytes) +int yaffs2_checkpt_rd(yaffs_Device *dev, void *data, int nBytes) { int i = 0; int ok = 1; @@ -298,7 +298,7 @@ int yaffs2_CheckpointRead(yaffs_Device *dev, void *data, int nBytes) dev->checkpointByteOffset >= dev->nDataBytesPerChunk) { if (dev->checkpointCurrentBlock < 0) { - yaffs2_CheckpointFindNextCheckpointBlock(dev); + yaffs2_checkpt_find_block(dev); dev->checkpointCurrentChunk = 0; } @@ -348,19 +348,19 @@ int yaffs2_CheckpointRead(yaffs_Device *dev, void *data, int nBytes) return i; } -int yaffs2_CheckpointClose(yaffs_Device *dev) +int yaffs_checkpt_close(yaffs_Device *dev) { if (dev->checkpointOpenForWrite) { if (dev->checkpointByteOffset != 0) - yaffs2_CheckpointFlushBuffer(dev); + yaffs2_checkpt_flush_buffer(dev); } else if(dev->checkpointBlockList){ int i; for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) { int blk = dev->checkpointBlockList[i]; yaffs_BlockInfo *bi = NULL; if( dev->internalStartBlock <= blk && blk <= dev->internalEndBlock) - bi = yaffs_GetBlockInfo(dev, blk); + bi = yaffs_get_block_info(dev, blk); if (bi && bi->blockState == YAFFS_BLOCK_STATE_EMPTY) bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT; else { @@ -387,14 +387,14 @@ int yaffs2_CheckpointClose(yaffs_Device *dev) return 0; } -int yaffs2_CheckpointInvalidateStream(yaffs_Device *dev) +int yaffs2_checkpt_invalidate_stream(yaffs_Device *dev) { /* Erase the checkpoint data */ T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate of %d blocks"TENDSTR), dev->blocksInCheckpoint)); - return yaffs2_CheckpointErase(dev); + return yaffs_checkpt_erase(dev); } diff --git a/yaffs_checkptrw.h b/yaffs_checkptrw.h index ea4f027..61ba179 100644 --- a/yaffs_checkptrw.h +++ b/yaffs_checkptrw.h @@ -18,17 +18,17 @@ #include "yaffs_guts.h" -int yaffs2_CheckpointOpen(yaffs_Device *dev, int forWriting); +int yaffs2_checkpt_open(yaffs_Device *dev, int forWriting); -int yaffs2_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes); +int yaffs2_checkpt_wr(yaffs_Device *dev, const void *data, int nBytes); -int yaffs2_CheckpointRead(yaffs_Device *dev, void *data, int nBytes); +int yaffs2_checkpt_rd(yaffs_Device *dev, void *data, int nBytes); -int yaffs2_GetCheckpointSum(yaffs_Device *dev, __u32 *sum); +int yaffs2_get_checkpt_sum(yaffs_Device *dev, __u32 *sum); -int yaffs2_CheckpointClose(yaffs_Device *dev); +int yaffs_checkpt_close(yaffs_Device *dev); -int yaffs2_CheckpointInvalidateStream(yaffs_Device *dev); +int yaffs2_checkpt_invalidate_stream(yaffs_Device *dev); #endif diff --git a/yaffs_ecc.c b/yaffs_ecc.c index da6145a..71ebe76 100644 --- a/yaffs_ecc.c +++ b/yaffs_ecc.c @@ -69,7 +69,7 @@ static const unsigned char column_parity_table[] = { /* Count the bits in an unsigned char or a U32 */ -static int yaffs_CountBits(unsigned char x) +static int yaffs_count_bits(unsigned char x) { int r = 0; while (x) { @@ -80,7 +80,7 @@ static int yaffs_CountBits(unsigned char x) return r; } -static int yaffs_CountBits32(unsigned x) +static int yaffs_count_bits32(unsigned x) { int r = 0; while (x) { @@ -92,7 +92,7 @@ static int yaffs_CountBits32(unsigned x) } /* Calculate the ECC for a 256-byte block of data */ -void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc) +void yaffs_ecc_cacl(const unsigned char *data, unsigned char *ecc) { unsigned int i; @@ -163,7 +163,7 @@ void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc) /* Correct the ECC on a 256 byte block of data */ -int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc, +int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc, const unsigned char *test_ecc) { unsigned char d0, d1, d2; /* deltas */ @@ -223,9 +223,9 @@ int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc, return 1; /* Corrected the error */ } - if ((yaffs_CountBits(d0) + - yaffs_CountBits(d1) + - yaffs_CountBits(d2)) == 1) { + if ((yaffs_count_bits(d0) + + yaffs_count_bits(d1) + + yaffs_count_bits(d2)) == 1) { /* Reccoverable error in ecc */ read_ecc[0] = test_ecc[0]; @@ -245,7 +245,7 @@ int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc, /* * ECCxxxOther does ECC calcs on arbitrary n bytes of data */ -void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes, +void yaffs_ecc_calc_other(const unsigned char *data, unsigned nBytes, yaffs_ECCOther *eccOther) { unsigned int i; @@ -272,7 +272,7 @@ void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes, eccOther->lineParityPrime = line_parity_prime; } -int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes, +int yaffs_ecc_correct_other(unsigned char *data, unsigned nBytes, yaffs_ECCOther *read_ecc, const yaffs_ECCOther *test_ecc) { @@ -309,8 +309,8 @@ int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes, return 1; /* corrected */ } - if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) + - yaffs_CountBits(cDelta)) == 1) { + if ((yaffs_count_bits32(lDelta) + yaffs_count_bits32(lDeltaPrime) + + yaffs_count_bits(cDelta)) == 1) { /* Reccoverable error in ecc */ *read_ecc = *test_ecc; diff --git a/yaffs_ecc.h b/yaffs_ecc.h index a1ee69a..ef1fa60 100644 --- a/yaffs_ecc.h +++ b/yaffs_ecc.h @@ -32,13 +32,13 @@ typedef struct { unsigned lineParityPrime; } yaffs_ECCOther; -void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc); -int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc, +void yaffs_ecc_cacl(const unsigned char *data, unsigned char *ecc); +int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc, const unsigned char *test_ecc); -void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes, +void yaffs_ecc_calc_other(const unsigned char *data, unsigned nBytes, yaffs_ECCOther *ecc); -int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes, +int yaffs_ecc_correct_other(unsigned char *data, unsigned nBytes, yaffs_ECCOther *read_ecc, const yaffs_ECCOther *test_ecc); #endif diff --git a/yaffs_getblockinfo.h b/yaffs_getblockinfo.h index 71fe1de..781d0ab 100644 --- a/yaffs_getblockinfo.h +++ b/yaffs_getblockinfo.h @@ -20,7 +20,7 @@ #include "yaffs_trace.h" /* Function to manipulate block info */ -static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk) +static Y_INLINE yaffs_BlockInfo *yaffs_get_block_info(yaffs_Device * dev, int blk) { if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) { T(YAFFS_TRACE_ERROR, diff --git a/yaffs_guts.c b/yaffs_guts.c index 7e97a5f..358e464 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -42,68 +42,68 @@ /* Robustification (if it ever comes about...) */ -static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND); -static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND, +static void yaffs_retire_block(yaffs_Device *dev, int blockInNAND); +static void yaffs_handle_chunk_wr_error(yaffs_Device *dev, int chunkInNAND, int erasedOk); -static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND, +static void yaffs_handle_chunk_wr_ok(yaffs_Device *dev, int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *tags); -static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND, +static void yaffs_handle_chunk_update(yaffs_Device *dev, int chunkInNAND, const yaffs_ExtendedTags *tags); /* Other local prototypes */ -static void yaffs_UpdateParent(yaffs_Object *obj); -static int yaffs_UnlinkObject(yaffs_Object *obj); -static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj); +static void yaffs_update_parent(yaffs_Object *obj); +static int yaffs_unlink_obj(yaffs_Object *obj); +static int yaffs_obj_cache_dirty(yaffs_Object *obj); -static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev, +static int yaffs_write_new_chunk(yaffs_Device *dev, const __u8 *buffer, yaffs_ExtendedTags *tags, int useReserve); -static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number, +static yaffs_Object *yaffs_new_obj(yaffs_Device *dev, int number, yaffs_ObjectType type); -static int yaffs_ApplyXMod(yaffs_Object *obj, char *buffer, yaffs_XAttrMod *xmod); +static int yaffs_apply_xattrib_mod(yaffs_Object *obj, char *buffer, yaffs_xattr_mod *xmod); -static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj); -static int yaffs_CheckStructures(void); -static int yaffs_DoGenericObjectDeletion(yaffs_Object *in); +static void yaffs_remove_obj_from_dir(yaffs_Object *obj); +static int yaffs_check_structures(void); +static int yaffs_generic_obj_del(yaffs_Object *in); -static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, +static int yaffs_check_chunk_erased(struct yaffs_DeviceStruct *dev, int chunkInNAND); -static int yaffs_UnlinkWorker(yaffs_Object *obj); +static int yaffs_unlink_worker(yaffs_Object *obj); -static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId, +static int yaffs_tags_match(const yaffs_ExtendedTags *tags, int objectId, int chunkInObject); -static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve, +static int yaffs_alloc_chunk(yaffs_Device *dev, int useReserve, yaffs_BlockInfo **blockUsedPtr); -static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in); +static void yaffs_check_obj_details_loaded(yaffs_Object *in); -static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in); -static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId); +static void yaffs_invalidate_whole_cache(yaffs_Object *in); +static void yaffs_invalidate_chunk_cache(yaffs_Object *object, int chunkId); -static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode, +static int yaffs_find_chunk_in_file(yaffs_Object *in, int chunkInInode, yaffs_ExtendedTags *tags); -static int yaffs_VerifyChunkWritten(yaffs_Device *dev, +static int yaffs_verify_chunk_written(yaffs_Device *dev, int chunkInNAND, const __u8 *data, yaffs_ExtendedTags *tags); -static void yaffs_LoadNameFromObjectHeader(yaffs_Device *dev,YCHAR *name, const YCHAR *ohName, int bufferSize); -static void yaffs_LoadObjectHeaderFromName(yaffs_Device *dev,YCHAR *ohName, const YCHAR *name); +static void yaffs_load_name_from_oh(yaffs_Device *dev,YCHAR *name, const YCHAR *ohName, int bufferSize); +static void yaffs_load_oh_from_name(yaffs_Device *dev,YCHAR *ohName, const YCHAR *name); /* Function to calculate chunk and offset */ -static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut, +static void yaffs_addr_to_chunk(yaffs_Device *dev, loff_t addr, int *chunkOut, __u32 *offsetOut) { int chunk; @@ -181,7 +181,7 @@ static __u32 Shifts(__u32 x) * Temporary buffer manipulations. */ -static int yaffs_InitialiseTempBuffers(yaffs_Device *dev) +static int yaffs_init_tmp_buffers(yaffs_Device *dev) { int i; __u8 *buf = (__u8 *)1; @@ -197,7 +197,7 @@ static int yaffs_InitialiseTempBuffers(yaffs_Device *dev) return buf ? YAFFS_OK : YAFFS_FAIL; } -__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo) +__u8 *yaffs_get_temp_buffer(yaffs_Device *dev, int lineNo) { int i, j; @@ -237,7 +237,7 @@ __u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo) } -void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, +void yaffs_release_temp_buffer(yaffs_Device *dev, __u8 *buffer, int lineNo) { int i; @@ -265,7 +265,7 @@ void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, /* * Determine if we have a managed buffer. */ -int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer) +int yaffs_is_managed_tmp_buffer(yaffs_Device *dev, const __u8 *buffer) { int i; @@ -298,7 +298,7 @@ int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer) * Simple hash function. Needs to have a reasonable spread */ -static Y_INLINE int yaffs_HashFunction(int n) +static Y_INLINE int yaffs_hash_fn(int n) { n = abs(n); return n % YAFFS_NOBJECT_BUCKETS; @@ -324,7 +324,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device *dev) * Erased NAND checking functions */ -int yaffs_CheckFF(__u8 *buffer, int nBytes) +int yaffs_check_ff(__u8 *buffer, int nBytes) { /* Horrible, slow implementation */ while (nBytes--) { @@ -335,55 +335,55 @@ int yaffs_CheckFF(__u8 *buffer, int nBytes) return 1; } -static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, +static int yaffs_check_chunk_erased(struct yaffs_DeviceStruct *dev, int chunkInNAND) { int retval = YAFFS_OK; - __u8 *data = yaffs_GetTempBuffer(dev, __LINE__); + __u8 *data = yaffs_get_temp_buffer(dev, __LINE__); yaffs_ExtendedTags tags; int result; - result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags); + result = yaffs_rd_chunk_tags_nand(dev, chunkInNAND, data, &tags); if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR) retval = YAFFS_FAIL; - if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) { + if (!yaffs_check_ff(data, dev->nDataBytesPerChunk) || tags.chunkUsed) { T(YAFFS_TRACE_NANDACCESS, (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND)); retval = YAFFS_FAIL; } - yaffs_ReleaseTempBuffer(dev, data, __LINE__); + yaffs_release_temp_buffer(dev, data, __LINE__); return retval; } -static int yaffs_VerifyChunkWritten(yaffs_Device *dev, +static int yaffs_verify_chunk_written(yaffs_Device *dev, int chunkInNAND, const __u8 *data, yaffs_ExtendedTags *tags) { int retval = YAFFS_OK; yaffs_ExtendedTags tempTags; - __u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__); + __u8 *buffer = yaffs_get_temp_buffer(dev,__LINE__); int result; - result = yaffs_ReadChunkWithTagsFromNAND(dev,chunkInNAND,buffer,&tempTags); + result = yaffs_rd_chunk_tags_nand(dev,chunkInNAND,buffer,&tempTags); if(memcmp(buffer,data,dev->nDataBytesPerChunk) || tempTags.objectId != tags->objectId || tempTags.chunkId != tags->chunkId || tempTags.byteCount != tags->byteCount) retval = YAFFS_FAIL; - yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); + yaffs_release_temp_buffer(dev, buffer, __LINE__); return retval; } -static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, +static int yaffs_write_new_chunk(struct yaffs_DeviceStruct *dev, const __u8 *data, yaffs_ExtendedTags *tags, int useReserve) @@ -392,13 +392,13 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, int writeOk = 0; int chunk; - yaffs2_InvalidateCheckpoint(dev); + yaffs2_checkpt_invalidate(dev); do { yaffs_BlockInfo *bi = 0; int erasedOk = 0; - chunk = yaffs_AllocateChunk(dev, useReserve, &bi); + chunk = yaffs_alloc_chunk(dev, useReserve, &bi); if (chunk < 0) { /* no space */ break; @@ -435,7 +435,7 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, bi->skipErasedCheck = 0; if (!bi->skipErasedCheck) { - erasedOk = yaffs_CheckChunkErased(dev, chunk); + erasedOk = yaffs_check_chunk_erased(dev, chunk); if (erasedOk != YAFFS_OK) { T(YAFFS_TRACE_ERROR, (TSTR("**>> yaffs chunk %d was not erased" @@ -444,29 +444,29 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, /* If not erased, delete this one, * skip rest of block and * try another chunk */ - yaffs_DeleteChunk(dev,chunk,1,__LINE__); - yaffs_SkipRestOfBlock(dev); + yaffs_chunk_del(dev,chunk,1,__LINE__); + yaffs_skip_rest_of_block(dev); continue; } } - writeOk = yaffs_WriteChunkWithTagsToNAND(dev, chunk, + writeOk = yaffs_wr_chunk_tags_nand(dev, chunk, data, tags); if(!bi->skipErasedCheck) - writeOk = yaffs_VerifyChunkWritten(dev, chunk, data, tags); + writeOk = yaffs_verify_chunk_written(dev, chunk, data, tags); if (writeOk != YAFFS_OK) { /* Clean up aborted write, skip to next block and * try another chunk */ - yaffs_HandleWriteChunkError(dev, chunk, erasedOk); + yaffs_handle_chunk_wr_error(dev, chunk, erasedOk); continue; } bi->skipErasedCheck = 1; /* Copy the data into the robustification buffer */ - yaffs_HandleWriteChunkOk(dev, chunk, data, tags); + yaffs_handle_chunk_wr_ok(dev, chunk, data, tags); } while (writeOk != YAFFS_OK && (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts)); @@ -491,16 +491,16 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, * Block retiring for handling a broken block. */ -static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND) +static void yaffs_retire_block(yaffs_Device *dev, int blockInNAND) { - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND); + yaffs_BlockInfo *bi = yaffs_get_block_info(dev, blockInNAND); - yaffs2_InvalidateCheckpoint(dev); + yaffs2_checkpt_invalidate(dev); - yaffs2_ClearOldestDirtySequence(dev,bi); + yaffs2_clear_oldest_dirty_seq(dev,bi); - if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) { - if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) { + if (yaffs_mark_bad(dev, blockInNAND) != YAFFS_OK) { + if (yaffs_erase_block(dev, blockInNAND) != YAFFS_OK) { T(YAFFS_TRACE_ALWAYS, (TSTR( "yaffs: Failed to mark bad and erase block %d" TENDSTR), blockInNAND)); @@ -508,10 +508,10 @@ static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND) yaffs_ExtendedTags tags; int chunkId = blockInNAND * dev->param.nChunksPerBlock; - __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__); + __u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__); memset(buffer, 0xff, dev->nDataBytesPerChunk); - yaffs_InitialiseTags(&tags); + yaffs_init_tags(&tags); tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK; if (dev->param.writeChunkWithTagsToNAND(dev, chunkId - dev->chunkOffset, buffer, &tags) != YAFFS_OK) @@ -519,7 +519,7 @@ static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND) TCONT("write bad block marker to block %d") TENDSTR), blockInNAND)); - yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); + yaffs_release_temp_buffer(dev, buffer, __LINE__); } } @@ -535,7 +535,7 @@ static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND) * */ -static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND, +static void yaffs_handle_chunk_wr_ok(yaffs_Device *dev, int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *tags) { @@ -545,7 +545,7 @@ static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND, tags=tags; } -static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND, +static void yaffs_handle_chunk_update(yaffs_Device *dev, int chunkInNAND, const yaffs_ExtendedTags *tags) { dev=dev; @@ -553,7 +553,7 @@ static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND, tags=tags; } -void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi) +void yaffs_handle_chunk_error(yaffs_Device *dev, yaffs_BlockInfo *bi) { if (!bi->gcPrioritise) { bi->gcPrioritise = 1; @@ -568,13 +568,13 @@ void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi) } } -static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND, +static void yaffs_handle_chunk_wr_error(yaffs_Device *dev, int chunkInNAND, int erasedOk) { int blockInNAND = chunkInNAND / dev->param.nChunksPerBlock; - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND); + yaffs_BlockInfo *bi = yaffs_get_block_info(dev, blockInNAND); - yaffs_HandleChunkError(dev, bi); + yaffs_handle_chunk_error(dev, bi); if (erasedOk) { /* Was an actual write failure, so mark the block for retirement */ @@ -584,14 +584,14 @@ static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND, } /* Delete the chunk */ - yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__); - yaffs_SkipRestOfBlock(dev); + yaffs_chunk_del(dev, chunkInNAND, 1, __LINE__); + yaffs_skip_rest_of_block(dev); } /*---------------- Name handling functions ------------*/ -static __u16 yaffs_CalcNameSum(const YCHAR *name) +static __u16 yaffs_calc_name_sum(const YCHAR *name) { __u16 sum = 0; __u16 i = 1; @@ -612,7 +612,7 @@ static __u16 yaffs_CalcNameSum(const YCHAR *name) return sum; } -void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name) +void yaffs_set_obj_name(yaffs_Object *obj, const YCHAR *name) { #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1)); @@ -621,18 +621,18 @@ void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name) else obj->shortName[0] = _Y('\0'); #endif - obj->sum = yaffs_CalcNameSum(name); + obj->sum = yaffs_calc_name_sum(name); } -void yaffs_SetObjectNameFromOH(yaffs_Object *obj, const yaffs_ObjectHeader *oh) +void yaffs_set_obj_name_from_oh(yaffs_Object *obj, const yaffs_ObjectHeader *oh) { #ifdef CONFIG_YAFFS_AUTO_UNICODE YCHAR tmpName[YAFFS_MAX_NAME_LENGTH+1]; memset(tmpName,0,sizeof(tmpName)); - yaffs_LoadNameFromObjectHeader(obj->myDev,tmpName,oh->name,YAFFS_MAX_NAME_LENGTH+1); - yaffs_SetObjectName(obj,tmpName); + yaffs_load_name_from_oh(obj->myDev,tmpName,oh->name,YAFFS_MAX_NAME_LENGTH+1); + yaffs_set_obj_name(obj,tmpName); #else - yaffs_SetObjectName(obj,oh->name); + yaffs_set_obj_name(obj,oh->name); #endif } @@ -644,9 +644,9 @@ void yaffs_SetObjectNameFromOH(yaffs_Object *obj, const yaffs_ObjectHeader *oh) */ -yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev) +yaffs_Tnode *yaffs_get_tnode(yaffs_Device *dev) { - yaffs_Tnode *tn = yaffs_AllocateRawTnode(dev); + yaffs_Tnode *tn = yaffs_alloc_raw_tnode(dev); if (tn){ memset(tn, 0, dev->tnodeSize); dev->nTnodes++; @@ -658,22 +658,22 @@ yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev) } /* FreeTnode frees up a tnode and puts it back on the free list */ -static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn) +static void yaffs_free_tnode(yaffs_Device *dev, yaffs_Tnode *tn) { - yaffs_FreeRawTnode(dev,tn); + yaffs_free_raw_tnode(dev,tn); dev->nTnodes--; dev->nCheckpointBlocksRequired = 0; /* force recalculation*/ } -static void yaffs_DeinitialiseTnodesAndObjects(yaffs_Device *dev) +static void yaffs_deinit_tnodes_and_objs(yaffs_Device *dev) { - yaffs_DeinitialiseRawTnodesAndObjects(dev); + yaffs_deinit_raw_tnodes_and_objs(dev); dev->nObjects = 0; dev->nTnodes = 0; } -void yaffs_LoadLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, +void yaffs_load_tnode_0(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val) { __u32 *map = (__u32 *)tn; @@ -703,7 +703,7 @@ void yaffs_LoadLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, } } -__u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, +__u32 yaffs_get_group_base(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos) { __u32 *map = (__u32 *)tn; @@ -740,7 +740,7 @@ __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, */ /* FindLevel0Tnode finds the level 0 tnode, if one exists. */ -yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev, +yaffs_Tnode *yaffs_find_tnode_0(yaffs_Device *dev, yaffs_FileStructure *fStruct, __u32 chunkId) { @@ -794,7 +794,7 @@ yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev, * be plugged into the ttree. */ -yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, +yaffs_Tnode *yaffs_add_find_tnode_0(yaffs_Device *dev, yaffs_FileStructure *fStruct, __u32 chunkId, yaffs_Tnode *passedTn) @@ -828,7 +828,7 @@ yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, /* Not tall enough, gotta make the tree taller */ for (i = fStruct->topLevel; i < requiredTallness; i++) { - tn = yaffs_GetTnode(dev); + tn = yaffs_get_tnode(dev); if (tn) { tn->internal[0] = fStruct->top; @@ -857,7 +857,7 @@ yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, if ((l > 1) && !tn->internal[x]) { /* Add missing non-level-zero tnode */ - tn->internal[x] = yaffs_GetTnode(dev); + tn->internal[x] = yaffs_get_tnode(dev); if(!tn->internal[x]) return NULL; } else if (l == 1) { @@ -865,12 +865,12 @@ yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, if (passedTn) { /* If we already have one, then release it.*/ if (tn->internal[x]) - yaffs_FreeTnode(dev, tn->internal[x]); + yaffs_free_tnode(dev, tn->internal[x]); tn->internal[x] = passedTn; } else if (!tn->internal[x]) { /* Don't have one, none passed in */ - tn->internal[x] = yaffs_GetTnode(dev); + tn->internal[x] = yaffs_get_tnode(dev); if(!tn->internal[x]) return NULL; } @@ -883,29 +883,29 @@ yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, /* top is level 0 */ if (passedTn) { memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8); - yaffs_FreeTnode(dev, passedTn); + yaffs_free_tnode(dev, passedTn); } } return tn; } -static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk, +static int yaffs_find_chunk_in_group(yaffs_Device *dev, int theChunk, yaffs_ExtendedTags *tags, int objectId, int chunkInInode) { int j; for (j = 0; theChunk && j < dev->chunkGroupSize; j++) { - if (yaffs_CheckChunkBit(dev, theChunk / dev->param.nChunksPerBlock, + if (yaffs_check_chunk_bit(dev, theChunk / dev->param.nChunksPerBlock, theChunk % dev->param.nChunksPerBlock)) { if(dev->chunkGroupSize == 1) return theChunk; else { - yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, + yaffs_rd_chunk_tags_nand(dev, theChunk, NULL, tags); - if (yaffs_TagsMatch(tags, objectId, chunkInInode)) { + if (yaffs_tags_match(tags, objectId, chunkInInode)) { /* found it; */ return theChunk; } @@ -924,7 +924,7 @@ static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk, * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete. */ -static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, +static int yaffs_del_worker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset, int *limit) { int i; @@ -945,7 +945,7 @@ static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, allDone = 0; } else { allDone = - yaffs_DeleteWorker(in, + yaffs_del_worker(in, tn-> internal [i], @@ -958,7 +958,7 @@ static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, limit); } if (allDone) { - yaffs_FreeTnode(dev, + yaffs_free_tnode(dev, tn-> internal[i]); tn->internal[i] = NULL; @@ -971,21 +971,21 @@ static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit; i--) { - theChunk = yaffs_GetChunkGroupBase(dev, tn, i); + theChunk = yaffs_get_group_base(dev, tn, i); if (theChunk) { chunkInInode = (chunkOffset << YAFFS_TNODES_LEVEL0_BITS) + i; foundChunk = - yaffs_FindChunkInGroup(dev, + yaffs_find_chunk_in_group(dev, theChunk, &tags, in->objectId, chunkInInode); if (foundChunk > 0) { - yaffs_DeleteChunk(dev, + yaffs_chunk_del(dev, foundChunk, 1, __LINE__); in->nDataChunks--; @@ -997,7 +997,7 @@ static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, } - yaffs_LoadLevel0Tnode(dev, tn, i, 0); + yaffs_load_tnode_0(dev, tn, i, 0); } } @@ -1013,7 +1013,7 @@ static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, #endif -static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk) +static void yaffs_soft_del_chunk(yaffs_Device *dev, int chunk) { yaffs_BlockInfo *theBlock; unsigned blockNo; @@ -1021,11 +1021,11 @@ static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk) T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk)); blockNo = chunk / dev->param.nChunksPerBlock; - theBlock = yaffs_GetBlockInfo(dev, blockNo); + theBlock = yaffs_get_block_info(dev, blockNo); if (theBlock) { theBlock->softDeletions++; dev->nFreeChunks++; - yaffs2_UpdateOldestDirtySequence(dev, blockNo, theBlock); + yaffs2_update_oldest_dirty_seq(dev, blockNo, theBlock); } } @@ -1035,7 +1035,7 @@ static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk) * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted. */ -static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, +static int yaffs_soft_del_worker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset) { int i; @@ -1050,7 +1050,7 @@ static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, i--) { if (tn->internal[i]) { allDone = - yaffs_SoftDeleteWorker(in, + yaffs_soft_del_worker(in, tn-> internal[i], level - 1, @@ -1059,7 +1059,7 @@ static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, YAFFS_TNODES_INTERNAL_BITS) + i); if (allDone) { - yaffs_FreeTnode(dev, + yaffs_free_tnode(dev, tn-> internal[i]); tn->internal[i] = NULL; @@ -1072,14 +1072,14 @@ static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, } else if (level == 0) { for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) { - theChunk = yaffs_GetChunkGroupBase(dev, tn, i); + theChunk = yaffs_get_group_base(dev, tn, i); if (theChunk) { /* 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_SoftDeleteChunk(dev, theChunk); - yaffs_LoadLevel0Tnode(dev, tn, i, 0); + yaffs_soft_del_chunk(dev, theChunk); + yaffs_load_tnode_0(dev, tn, i, 0); } } @@ -1093,21 +1093,21 @@ static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, } -static void yaffs_SoftDeleteFile(yaffs_Object *obj) +static void yaffs_soft_del_file(yaffs_Object *obj) { if (obj->deleted && obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) { if (obj->nDataChunks <= 0) { /* Empty file with no duplicate object headers, just delete it immediately */ - yaffs_FreeTnode(obj->myDev, + yaffs_free_tnode(obj->myDev, obj->variant.fileVariant.top); obj->variant.fileVariant.top = NULL; T(YAFFS_TRACE_TRACING, (TSTR("yaffs: Deleting empty file %d" TENDSTR), obj->objectId)); - yaffs_DoGenericObjectDeletion(obj); + yaffs_generic_obj_del(obj); } else { - yaffs_SoftDeleteWorker(obj, + yaffs_soft_del_worker(obj, obj->variant.fileVariant.top, obj->variant.fileVariant. topLevel, 0); @@ -1131,7 +1131,7 @@ static void yaffs_SoftDeleteFile(yaffs_Object *obj) * If there is no data in a subtree then it is pruned. */ -static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn, +static yaffs_Tnode *yaffs_prune_worker(yaffs_Device *dev, yaffs_Tnode *tn, __u32 level, int del0) { int i; @@ -1144,7 +1144,7 @@ static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn, for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) { if (tn->internal[i]) { tn->internal[i] = - yaffs_PruneWorker(dev, tn->internal[i], + yaffs_prune_worker(dev, tn->internal[i], level - 1, (i == 0) ? del0 : 1); } @@ -1165,7 +1165,7 @@ static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn, if (hasData == 0 && del0) { /* Free and return NULL */ - yaffs_FreeTnode(dev, tn); + yaffs_free_tnode(dev, tn); tn = NULL; } @@ -1175,7 +1175,7 @@ static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn, } -static int yaffs_PruneFileStructure(yaffs_Device *dev, +static int yaffs_prune_tree(yaffs_Device *dev, yaffs_FileStructure *fStruct) { int i; @@ -1185,7 +1185,7 @@ static int yaffs_PruneFileStructure(yaffs_Device *dev, if (fStruct->topLevel > 0) { fStruct->top = - yaffs_PruneWorker(dev, fStruct->top, fStruct->topLevel, 0); + yaffs_prune_worker(dev, fStruct->top, fStruct->topLevel, 0); /* Now we have a tree with all the non-zero branches NULL but the height * is the same as it was. @@ -1206,7 +1206,7 @@ static int yaffs_PruneFileStructure(yaffs_Device *dev, if (!hasData) { fStruct->top = tn->internal[0]; fStruct->topLevel--; - yaffs_FreeTnode(dev, tn); + yaffs_free_tnode(dev, tn); } else { done = 1; } @@ -1220,9 +1220,9 @@ static int yaffs_PruneFileStructure(yaffs_Device *dev, /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */ -static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev) +static yaffs_Object *yaffs_alloc_empty_obj(yaffs_Device *dev) { - yaffs_Object *obj = yaffs_AllocateRawObject(dev); + yaffs_Object *obj = yaffs_alloc_raw_obj(dev); if (obj) { dev->nObjects++; @@ -1251,7 +1251,7 @@ static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev) * check if lostNFound exists first */ if (dev->lostNFoundDir) - yaffs_AddObjectToDirectory(dev->lostNFoundDir, obj); + yaffs_add_obj_to_dir(dev->lostNFoundDir, obj); obj->beingCreated = 0; } @@ -1261,12 +1261,12 @@ static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev) return obj; } -static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number, +static yaffs_Object *yaffs_create_fake_dir(yaffs_Device *dev, int number, __u32 mode) { yaffs_Object *obj = - yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY); + yaffs_new_obj(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY); if (obj) { obj->fake = 1; /* it is fake so it might have no NAND presence... */ obj->renameAllowed = 0; /* ... and we're not allowed to rename it... */ @@ -1282,7 +1282,7 @@ static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number, } -static void yaffs_UnhashObject(yaffs_Object *obj) +static void yaffs_unhash_obj(yaffs_Object *obj) { int bucket; yaffs_Device *dev = obj->myDev; @@ -1290,13 +1290,13 @@ static void yaffs_UnhashObject(yaffs_Object *obj) /* If it is still linked into the bucket list, free from the list */ if (!ylist_empty(&obj->hashLink)) { ylist_del_init(&obj->hashLink); - bucket = yaffs_HashFunction(obj->objectId); + bucket = yaffs_hash_fn(obj->objectId); dev->objectBucket[bucket].count--; } } /* FreeObject frees up a Object and puts it back on the free list */ -static void yaffs_FreeObject(yaffs_Object *obj) +static void yaffs_free_obj(yaffs_Object *obj) { yaffs_Device *dev = obj->myDev; @@ -1318,28 +1318,28 @@ static void yaffs_FreeObject(yaffs_Object *obj) return; } - yaffs_UnhashObject(obj); + yaffs_unhash_obj(obj); - yaffs_FreeRawObject(dev,obj); + yaffs_free_raw_obj(dev,obj); dev->nObjects--; dev->nCheckpointBlocksRequired = 0; /* force recalculation*/ } -void yaffs_HandleDeferedFree(yaffs_Object *obj) +void yaffs_handle_defered_free(yaffs_Object *obj) { if (obj->deferedFree) - yaffs_FreeObject(obj); + yaffs_free_obj(obj); } -static void yaffs_InitialiseTnodesAndObjects(yaffs_Device *dev) +static void yaffs_init_tnodes_and_objs(yaffs_Device *dev) { int i; dev->nObjects = 0; dev->nTnodes = 0; - yaffs_InitialiseRawTnodesAndObjects(dev); + yaffs_init_raw_tnodes_and_objs(dev); for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { YINIT_LIST_HEAD(&dev->objectBucket[i].list); @@ -1347,7 +1347,7 @@ static void yaffs_InitialiseTnodesAndObjects(yaffs_Device *dev) } } -static int yaffs_FindNiceObjectBucket(yaffs_Device *dev) +static int yaffs_find_nice_bucket(yaffs_Device *dev) { int i; int l = 999; @@ -1371,9 +1371,9 @@ static int yaffs_FindNiceObjectBucket(yaffs_Device *dev) return l; } -static int yaffs_CreateNewObjectNumber(yaffs_Device *dev) +static int yaffs_new_obj_id(yaffs_Device *dev) { - int bucket = yaffs_FindNiceObjectBucket(dev); + int bucket = yaffs_find_nice_bucket(dev); /* Now find an object value that has not already been taken * by scanning the list. @@ -1384,7 +1384,7 @@ static int yaffs_CreateNewObjectNumber(yaffs_Device *dev) __u32 n = (__u32) bucket; - /* yaffs_CheckObjectHashSanity(); */ + /* yaffs_check_obj_hash_sane(); */ while (!found) { found = 1; @@ -1403,18 +1403,18 @@ static int yaffs_CreateNewObjectNumber(yaffs_Device *dev) return n; } -static void yaffs_HashObject(yaffs_Object *in) +static void yaffs_hash_obj(yaffs_Object *in) { - int bucket = yaffs_HashFunction(in->objectId); + int bucket = yaffs_hash_fn(in->objectId); yaffs_Device *dev = in->myDev; ylist_add(&in->hashLink, &dev->objectBucket[bucket].list); dev->objectBucket[bucket].count++; } -yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number) +yaffs_Object *yaffs_find_by_number(yaffs_Device *dev, __u32 number) { - int bucket = yaffs_HashFunction(number); + int bucket = yaffs_hash_fn(number); struct ylist_head *i; yaffs_Object *in; @@ -1436,25 +1436,25 @@ yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number) return NULL; } -yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number, +yaffs_Object *yaffs_new_obj(yaffs_Device *dev, int number, yaffs_ObjectType type) { yaffs_Object *theObject=NULL; yaffs_Tnode *tn = NULL; if (number < 0) - number = yaffs_CreateNewObjectNumber(dev); + number = yaffs_new_obj_id(dev); if (type == YAFFS_OBJECT_TYPE_FILE) { - tn = yaffs_GetTnode(dev); + tn = yaffs_get_tnode(dev); if (!tn) return NULL; } - theObject = yaffs_AllocateEmptyObject(dev); + theObject = yaffs_alloc_empty_obj(dev); if (!theObject){ if(tn) - yaffs_FreeTnode(dev,tn); + yaffs_free_tnode(dev,tn); return NULL; } @@ -1464,7 +1464,7 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number, theObject->renameAllowed = 1; theObject->unlinkAllowed = 1; theObject->objectId = number; - yaffs_HashObject(theObject); + yaffs_hash_obj(theObject); theObject->variantType = type; #ifdef CONFIG_YAFFS_WINCE yfsd_WinFileTimeNow(theObject->win_atime); @@ -1506,24 +1506,24 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number, return theObject; } -yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev, +yaffs_Object *yaffs_find_or_create_by_number(yaffs_Device *dev, int number, yaffs_ObjectType type) { yaffs_Object *theObject = NULL; if (number > 0) - theObject = yaffs_FindObjectByNumber(dev, number); + theObject = yaffs_find_by_number(dev, number); if (!theObject) - theObject = yaffs_CreateNewObject(dev, number, type); + theObject = yaffs_new_obj(dev, number, type); return theObject; } -YCHAR *yaffs_CloneString(const YCHAR *str) +YCHAR *yaffs_clone_str(const YCHAR *str) { YCHAR *newStr = NULL; int len; @@ -1548,7 +1548,7 @@ YCHAR *yaffs_CloneString(const YCHAR *str) * rdev only has meaning for devices (a subset of special objects) */ -static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type, +static yaffs_Object *yaffs_create_obj(yaffs_ObjectType type, yaffs_Object *parent, const YCHAR *name, __u32 mode, @@ -1563,16 +1563,16 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type, yaffs_Device *dev = parent->myDev; /* Check if the entry exists. If it does then fail the call since we don't want a dup.*/ - if (yaffs_FindObjectByName(parent, name)) + if (yaffs_find_by_name(parent, name)) return NULL; if (type == YAFFS_OBJECT_TYPE_SYMLINK) { - str = yaffs_CloneString(aliasString); + str = yaffs_clone_str(aliasString); if (!str) return NULL; } - in = yaffs_CreateNewObject(dev, -1, type); + in = yaffs_new_obj(dev, -1, type); if (!in){ if(str) @@ -1605,10 +1605,10 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type, #endif in->nDataChunks = 0; - yaffs_SetObjectName(in, name); + yaffs_set_obj_name(in, name); in->dirty = 1; - yaffs_AddObjectToDirectory(parent, in); + yaffs_add_obj_to_dir(parent, in); in->myDev = parent->myDev; @@ -1631,44 +1631,44 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type, break; } - if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0, NULL) < 0) { + if (yaffs_update_oh(in, name, 0, 0, 0, NULL) < 0) { /* Could not create the object header, fail the creation */ - yaffs_DeleteObject(in); + yaffs_del_obj(in); in = NULL; } - yaffs_UpdateParent(parent); + yaffs_update_parent(parent); } return in; } -yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name, +yaffs_Object *yaffs_create_file(yaffs_Object *parent, const YCHAR *name, __u32 mode, __u32 uid, __u32 gid) { - return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode, + return yaffs_create_obj(YAFFS_OBJECT_TYPE_FILE, parent, name, mode, uid, gid, NULL, NULL, 0); } -yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name, +yaffs_Object *yaffs_create_dir(yaffs_Object *parent, const YCHAR *name, __u32 mode, __u32 uid, __u32 gid) { - return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name, + return yaffs_create_obj(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name, mode, uid, gid, NULL, NULL, 0); } -yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name, +yaffs_Object *yaffs_create_special(yaffs_Object *parent, const YCHAR *name, __u32 mode, __u32 uid, __u32 gid, __u32 rdev) { - return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode, + return yaffs_create_obj(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode, uid, gid, NULL, NULL, rdev); } -yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name, +yaffs_Object *yaffs_create_symlink(yaffs_Object *parent, const YCHAR *name, __u32 mode, __u32 uid, __u32 gid, const YCHAR *alias) { - return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode, + return yaffs_create_obj(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode, uid, gid, NULL, alias, 0); } @@ -1677,9 +1677,9 @@ yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name, yaffs_Object *equivalentObject) { /* Get the real object in case we were fed a hard link as an equivalent object */ - equivalentObject = yaffs_GetEquivalentObject(equivalentObject); + equivalentObject = yaffs_get_equivalent_obj(equivalentObject); - if (yaffs_MknodObject + if (yaffs_create_obj (YAFFS_OBJECT_TYPE_HARDLINK, parent, name, 0, 0, 0, equivalentObject, NULL, 0)) { return equivalentObject; @@ -1689,7 +1689,7 @@ yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name, } -static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir, +static int yaffs_change_obj_name(yaffs_Object *obj, yaffs_Object *newDir, const YCHAR *newName, int force, int shadows) { int unlinkOp; @@ -1703,7 +1703,7 @@ static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir, if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { T(YAFFS_TRACE_ALWAYS, (TSTR - ("tragedy: yaffs_ChangeObjectName: newDir is not a directory" + ("tragedy: yaffs_change_obj_name: newDir is not a directory" TENDSTR))); YBUG(); } @@ -1717,7 +1717,7 @@ static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir, deleteOp = (newDir == obj->myDev->deletedDir); - existingTarget = yaffs_FindObjectByName(newDir, newName); + existingTarget = yaffs_find_by_name(newDir, newName); /* 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. @@ -1730,23 +1730,23 @@ static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir, (shadows > 0) || !existingTarget) && newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) { - yaffs_SetObjectName(obj, newName); + yaffs_set_obj_name(obj, newName); obj->dirty = 1; - yaffs_AddObjectToDirectory(newDir, obj); + yaffs_add_obj_to_dir(newDir, obj); if (unlinkOp) obj->unlinked = 1; /* If it is a deletion then we mark it as a shrink for gc purposes. */ - if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows, NULL) >= 0) + if (yaffs_update_oh(obj, newName, 0, deleteOp, shadows, NULL) >= 0) return YAFFS_OK; } return YAFFS_FAIL; } -int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName, +int yaffs_rename_obj(yaffs_Object *oldDir, const YCHAR *oldName, yaffs_Object *newDir, const YCHAR *newName) { yaffs_Object *obj = NULL; @@ -1776,13 +1776,13 @@ int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName, /* ENAMETOOLONG */ return YAFFS_FAIL; - obj = yaffs_FindObjectByName(oldDir, oldName); + obj = yaffs_find_by_name(oldDir, oldName); if (obj && obj->renameAllowed) { /* Now do the handling for an existing target, if there is one */ - existingTarget = yaffs_FindObjectByName(newDir, newName); + existingTarget = yaffs_find_by_name(newDir, newName); if (existingTarget && existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY && !ylist_empty(&existingTarget->variant.directoryVariant.children)) { @@ -1796,18 +1796,18 @@ int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName, * */ dev->gcDisable=1; - yaffs_ChangeObjectName(obj, newDir, newName, force, + yaffs_change_obj_name(obj, newDir, newName, force, existingTarget->objectId); existingTarget->isShadowed = 1; - yaffs_UnlinkObject(existingTarget); + yaffs_unlink_obj(existingTarget); dev->gcDisable=0; } - result = yaffs_ChangeObjectName(obj, newDir, newName, 1, 0); + result = yaffs_change_obj_name(obj, newDir, newName, 1, 0); - yaffs_UpdateParent(oldDir); + yaffs_update_parent(oldDir); if(newDir != oldDir) - yaffs_UpdateParent(newDir); + yaffs_update_parent(newDir); return result; } @@ -1816,7 +1816,7 @@ int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName, /*------------------------- Block Management and Page Allocation ----------------*/ -static int yaffs_InitialiseBlocks(yaffs_Device *dev) +static int yaffs_init_blocks(yaffs_Device *dev) { int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1; @@ -1853,7 +1853,7 @@ static int yaffs_InitialiseBlocks(yaffs_Device *dev) return YAFFS_FAIL; } -static void yaffs_DeinitialiseBlocks(yaffs_Device *dev) +static void yaffs_deinit_blocks(yaffs_Device *dev) { if (dev->blockInfoAlt && dev->blockInfo) YFREE_ALT(dev->blockInfo); @@ -1872,9 +1872,9 @@ static void yaffs_DeinitialiseBlocks(yaffs_Device *dev) dev->chunkBits = NULL; } -void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo) +void yaffs_block_became_dirty(yaffs_Device *dev, int blockNo) { - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo); + yaffs_BlockInfo *bi = yaffs_get_block_info(dev, blockNo); int erasedOk = 0; @@ -1883,10 +1883,10 @@ void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo) */ T(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE, - (TSTR("yaffs_BlockBecameDirty block %d state %d %s"TENDSTR), + (TSTR("yaffs_block_became_dirty block %d state %d %s"TENDSTR), blockNo, bi->blockState, (bi->needsRetiring) ? "needs retiring" : "")); - yaffs2_ClearOldestDirtySequence(dev,bi); + yaffs2_clear_oldest_dirty_seq(dev,bi); bi->blockState = YAFFS_BLOCK_STATE_DIRTY; @@ -1901,8 +1901,8 @@ void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo) } if (!bi->needsRetiring) { - yaffs2_InvalidateCheckpoint(dev); - erasedOk = yaffs_EraseBlockInNAND(dev, blockNo); + yaffs2_checkpt_invalidate(dev); + erasedOk = yaffs_erase_block(dev, blockNo); if (!erasedOk) { dev->nErasureFailures++; T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, @@ -1911,10 +1911,10 @@ void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo) } if (erasedOk && - ((yaffs_traceMask & YAFFS_TRACE_ERASE) || !yaffs_SkipVerification(dev))) { + ((yaffs_trace_mask & YAFFS_TRACE_ERASE) || !yaffs_skip_verification(dev))) { int i; for (i = 0; i < dev->param.nChunksPerBlock; i++) { - if (!yaffs_CheckChunkErased + if (!yaffs_check_chunk_erased (dev, blockNo * dev->param.nChunksPerBlock + i)) { T(YAFFS_TRACE_ERROR, (TSTR @@ -1934,20 +1934,20 @@ void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo) bi->hasShrinkHeader = 0; bi->skipErasedCheck = 1; /* This is clean, so no need to check */ bi->gcPrioritise = 0; - yaffs_ClearChunkBits(dev, blockNo); + yaffs_clear_chunk_bits(dev, blockNo); T(YAFFS_TRACE_ERASE, (TSTR("Erased block %d" TENDSTR), blockNo)); } else { dev->nFreeChunks -= dev->param.nChunksPerBlock; /* We lost a block of free space */ - yaffs_RetireBlock(dev, blockNo); + yaffs_retire_block(dev, blockNo); T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, (TSTR("**>> Block %d retired" TENDSTR), blockNo)); } } -static int yaffs_FindBlockForAllocation(yaffs_Device *dev) +static int yaffs_find_alloc_block(yaffs_Device *dev) { int i; @@ -1972,7 +1972,7 @@ static int yaffs_FindBlockForAllocation(yaffs_Device *dev) dev->allocationBlockFinder = dev->internalStartBlock; } - bi = yaffs_GetBlockInfo(dev, dev->allocationBlockFinder); + bi = yaffs_get_block_info(dev, dev->allocationBlockFinder); if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) { bi->blockState = YAFFS_BLOCK_STATE_ALLOCATING; @@ -1998,22 +1998,22 @@ static int yaffs_FindBlockForAllocation(yaffs_Device *dev) /* * Check if there's space to allocate... - * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()? + * Thinks.... do we need top make this ths same as yaffs_get_free_chunks()? */ -int yaffs_CheckSpaceForAllocation(yaffs_Device *dev, int nChunks) +int yaffs_check_alloc_available(yaffs_Device *dev, int nChunks) { int reservedChunks; int reservedBlocks = dev->param.nReservedBlocks; int checkpointBlocks; - checkpointBlocks = yaffs2_CalcCheckpointBlocksRequired(dev); + checkpointBlocks = yaffs_calc_checkpt_blocks_required(dev); reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->param.nChunksPerBlock); return (dev->nFreeChunks > (reservedChunks + nChunks)); } -static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve, +static int yaffs_alloc_chunk(yaffs_Device *dev, int useReserve, yaffs_BlockInfo **blockUsedPtr) { int retVal; @@ -2021,11 +2021,11 @@ static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve, if (dev->allocationBlock < 0) { /* Get next block to allocate off */ - dev->allocationBlock = yaffs_FindBlockForAllocation(dev); + dev->allocationBlock = yaffs_find_alloc_block(dev); dev->allocationPage = 0; } - if (!useReserve && !yaffs_CheckSpaceForAllocation(dev, 1)) { + if (!useReserve && !yaffs_check_alloc_available(dev, 1)) { /* Not enough space to allocate unless we're allowed to use the reserve. */ return -1; } @@ -2037,12 +2037,12 @@ static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve, /* Next page please.... */ if (dev->allocationBlock >= 0) { - bi = yaffs_GetBlockInfo(dev, dev->allocationBlock); + bi = yaffs_get_block_info(dev, dev->allocationBlock); retVal = (dev->allocationBlock * dev->param.nChunksPerBlock) + dev->allocationPage; bi->pagesInUse++; - yaffs_SetChunkBit(dev, dev->allocationBlock, + yaffs_set_chunk_bit(dev, dev->allocationBlock, dev->allocationPage); dev->allocationPage++; @@ -2067,7 +2067,7 @@ static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve, return -1; } -static int yaffs_GetErasedChunks(yaffs_Device *dev) +static int yaffs_get_erased_chunks(yaffs_Device *dev) { int n; @@ -2081,13 +2081,13 @@ static int yaffs_GetErasedChunks(yaffs_Device *dev) } /* - * yaffs_SkipRestOfBlock() skips over the rest of the allocation block + * yaffs_skip_rest_of_block() skips over the rest of the allocation block * if we don't want to write to it. */ -void yaffs_SkipRestOfBlock(yaffs_Device *dev) +void yaffs_skip_rest_of_block(yaffs_Device *dev) { if(dev->allocationBlock > 0){ - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->allocationBlock); + yaffs_BlockInfo *bi = yaffs_get_block_info(dev, dev->allocationBlock); if(bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING){ bi->blockState = YAFFS_BLOCK_STATE_FULL; dev->allocationBlock = -1; @@ -2096,7 +2096,7 @@ void yaffs_SkipRestOfBlock(yaffs_Device *dev) } -static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, +static int yaffs_gc_block(yaffs_Device *dev, int block, int wholeBlock) { int oldChunk; @@ -2108,12 +2108,12 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, int matchingChunk; int maxCopies; - int chunksBefore = yaffs_GetErasedChunks(dev); + int chunksBefore = yaffs_get_erased_chunks(dev); int chunksAfter; yaffs_ExtendedTags tags; - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, block); + yaffs_BlockInfo *bi = yaffs_get_block_info(dev, block); yaffs_Object *object; @@ -2127,7 +2127,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, bi->hasShrinkHeader, wholeBlock)); - /*yaffs_VerifyFreeChunks(dev); */ + /*yaffs_verify_free_chunks(dev); */ if(bi->blockState == YAFFS_BLOCK_STATE_FULL) bi->blockState = YAFFS_BLOCK_STATE_COLLECTING; @@ -2137,17 +2137,17 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, dev->gcDisable = 1; if (isCheckpointBlock || - !yaffs_StillSomeChunkBits(dev, block)) { + !yaffs_still_some_chunks(dev, block)) { T(YAFFS_TRACE_TRACING, (TSTR ("Collecting block %d that has no chunks in use" TENDSTR), block)); - yaffs_BlockBecameDirty(dev, block); + yaffs_block_became_dirty(dev, block); } else { - __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__); + __u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__); - yaffs_VerifyBlock(dev, bi, block); + yaffs_verify_blk(dev, bi, block); maxCopies = (wholeBlock) ? dev->param.nChunksPerBlock : 5; oldChunk = block * dev->param.nChunksPerBlock + dev->gcChunk; @@ -2158,7 +2158,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) && maxCopies > 0; dev->gcChunk++, oldChunk++) { - if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) { + if (yaffs_check_chunk_bit(dev, block, dev->gcChunk)) { /* This page is in use and might need to be copied off */ @@ -2166,13 +2166,13 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, markNAND = 1; - yaffs_InitialiseTags(&tags); + yaffs_init_tags(&tags); - yaffs_ReadChunkWithTagsFromNAND(dev, oldChunk, + yaffs_rd_chunk_tags_nand(dev, oldChunk, buffer, &tags); object = - yaffs_FindObjectByNumber(dev, + yaffs_find_by_number(dev, tags.objectId); T(YAFFS_TRACE_GC_DETAIL, @@ -2181,13 +2181,13 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, dev->gcChunk, tags.objectId, tags.chunkId, tags.byteCount)); - if (object && !yaffs_SkipVerification(dev)) { + if (object && !yaffs_skip_verification(dev)) { if (tags.chunkId == 0) matchingChunk = object->hdrChunk; else if (object->softDeleted) matchingChunk = oldChunk; /* Defeat the test */ else - matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL); + matchingChunk = yaffs_find_chunk_in_file(object, tags.chunkId, NULL); if (oldChunk != matchingChunk) T(YAFFS_TRACE_ERROR, @@ -2237,11 +2237,11 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, * Can be discarded and the file deleted. */ object->hdrChunk = 0; - yaffs_FreeTnode(object->myDev, + yaffs_free_tnode(object->myDev, object->variant. fileVariant.top); object->variant.fileVariant.top = NULL; - yaffs_DoGenericObjectDeletion(object); + yaffs_generic_obj_del(object); } else if (object) { /* It's either a data chunk in a live file or @@ -2277,12 +2277,12 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, tags.extraFileLength = oh->fileSize; } - yaffs_VerifyObjectHeader(object, oh, &tags, 1); + yaffs_verify_oh(object, oh, &tags, 1); newChunk = - yaffs_WriteNewChunkWithTagsToNAND(dev,(__u8 *) oh, &tags, 1); + yaffs_write_new_chunk(dev,(__u8 *) oh, &tags, 1); } else newChunk = - yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &tags, 1); + yaffs_write_new_chunk(dev, buffer, &tags, 1); if (newChunk < 0) { retVal = YAFFS_FAIL; @@ -2297,7 +2297,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, } else { /* It's a data chunk */ int ok; - ok = yaffs_PutChunkIntoFile + ok = yaffs_put_chunk_in_file (object, tags.chunkId, newChunk, 0); @@ -2306,18 +2306,18 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, } if (retVal == YAFFS_OK) - yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__); + yaffs_chunk_del(dev, oldChunk, markNAND, __LINE__); } } - yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); + yaffs_release_temp_buffer(dev, buffer, __LINE__); } - yaffs_VerifyCollectedBlock(dev, bi, block); + yaffs_verify_collected_blk(dev, bi, block); @@ -2333,10 +2333,10 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, for (i = 0; i < dev->nCleanups; i++) { /* Time to delete the file too */ object = - yaffs_FindObjectByNumber(dev, + yaffs_find_by_number(dev, dev->gcCleanupList[i]); if (object) { - yaffs_FreeTnode(dev, + yaffs_free_tnode(dev, object->variant.fileVariant. top); object->variant.fileVariant.top = NULL; @@ -2344,14 +2344,14 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, (TSTR ("yaffs: About to finally delete object %d" TENDSTR), object->objectId)); - yaffs_DoGenericObjectDeletion(object); + yaffs_generic_obj_del(object); object->myDev->nDeletedFiles--; } } - chunksAfter = yaffs_GetErasedChunks(dev); + chunksAfter = yaffs_get_erased_chunks(dev); if (chunksBefore >= chunksAfter) { T(YAFFS_TRACE_GC, (TSTR @@ -2373,7 +2373,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, * for garbage collection. */ -static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev, +static unsigned yaffs_find_gc_block(yaffs_Device *dev, int aggressive, int background) { @@ -2396,7 +2396,7 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev, if (bi->gcPrioritise) { prioritisedExists = 1; if (bi->blockState == YAFFS_BLOCK_STATE_FULL && - yaffs2_BlockNotDisqualifiedFromGC(dev, bi)) { + yaffs_block_ok_for_gc(dev, bi)) { selected = i; prioritised = 1; } @@ -2464,14 +2464,14 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev, dev->gcBlockFinder > dev->internalEndBlock) dev->gcBlockFinder = dev->internalStartBlock; - bi = yaffs_GetBlockInfo(dev, dev->gcBlockFinder); + bi = yaffs_get_block_info(dev, dev->gcBlockFinder); pagesUsed = bi->pagesInUse - bi->softDeletions; if (bi->blockState == YAFFS_BLOCK_STATE_FULL && pagesUsed < dev->param.nChunksPerBlock && (dev->gcDirtiest < 1 || pagesUsed < dev->gcPagesInUse) && - yaffs2_BlockNotDisqualifiedFromGC(dev, bi)) { + yaffs_block_ok_for_gc(dev, bi)) { dev->gcDirtiest = dev->gcBlockFinder; dev->gcPagesInUse = pagesUsed; } @@ -2488,12 +2488,12 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev, if(!selected && dev->param.isYaffs2 && dev->gcNotDone >= ( background ? 10 : 20)){ - yaffs2_FindOldestDirtySequence(dev); + yaffs2_find_oldest_dirty_seq(dev); if(dev->oldestDirtyBlock > 0) { selected = dev->oldestDirtyBlock; dev->gcDirtiest = selected; dev->oldestDirtyGCs++; - bi = yaffs_GetBlockInfo(dev, selected); + bi = yaffs_get_block_info(dev, selected); dev->gcPagesInUse = bi->pagesInUse - bi->softDeletions; } else dev->gcNotDone = 0; @@ -2538,7 +2538,7 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *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_CheckGarbageCollection(yaffs_Device *dev, int background) +static int yaffs_check_gc(yaffs_Device *dev, int background) { int aggressive = 0; int gcOk = YAFFS_OK; @@ -2563,7 +2563,7 @@ static int yaffs_CheckGarbageCollection(yaffs_Device *dev, int background) do { maxTries++; - checkpointBlockAdjust = yaffs2_CalcCheckpointBlocksRequired(dev); + checkpointBlockAdjust = yaffs_calc_checkpt_blocks_required(dev); minErased = dev->param.nReservedBlocks + checkpointBlockAdjust + 1; erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock; @@ -2592,12 +2592,12 @@ static int yaffs_CheckGarbageCollection(yaffs_Device *dev, int background) /* If we don't already have a block being gc'd then see if we should start another */ if (dev->gcBlock < 1 && !aggressive) { - dev->gcBlock = yaffs2_FindRefreshBlock(dev); + dev->gcBlock = yaffs2_find_refresh_block(dev); dev->gcChunk = 0; dev->nCleanups=0; } if (dev->gcBlock < 1) { - dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive, background); + dev->gcBlock = yaffs_find_gc_block(dev, aggressive, background); dev->gcChunk = 0; dev->nCleanups=0; } @@ -2612,7 +2612,7 @@ static int yaffs_CheckGarbageCollection(yaffs_Device *dev, int background) ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR), dev->nErasedBlocks, aggressive)); - gcOk = yaffs_GarbageCollectBlock(dev, dev->gcBlock, aggressive); + gcOk = yaffs_gc_block(dev, dev->gcBlock, aggressive); } if (dev->nErasedBlocks < (dev->param.nReservedBlocks) && dev->gcBlock > 0) { @@ -2629,23 +2629,23 @@ static int yaffs_CheckGarbageCollection(yaffs_Device *dev, int background) } /* - * yaffs_BackgroundGarbageCollect() + * yaffs_bg_gc() * Garbage collects. Intended to be called from a background thread. * Returns non-zero if at least half the free chunks are erased. */ -int yaffs_BackgroundGarbageCollect(yaffs_Device *dev, unsigned urgency) +int yaffs_bg_gc(yaffs_Device *dev, unsigned urgency) { int erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock; T(YAFFS_TRACE_BACKGROUND, (TSTR("Background gc %u" TENDSTR),urgency)); - yaffs_CheckGarbageCollection(dev, 1); + yaffs_check_gc(dev, 1); return erasedChunks > dev->nFreeChunks/2; } /*------------------------- TAGS --------------------------------*/ -static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId, +static int yaffs_tags_match(const yaffs_ExtendedTags *tags, int objectId, int chunkInObject) { return (tags->chunkId == chunkInObject && @@ -2656,7 +2656,7 @@ static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId, /*-------------------- Data file manipulation -----------------*/ -static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode, +static int yaffs_find_chunk_in_file(yaffs_Object *in, int chunkInInode, yaffs_ExtendedTags *tags) { /*Get the Tnode, then get the level 0 offset chunk offset */ @@ -2672,19 +2672,19 @@ static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode, tags = &localTags; } - tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode); + tn = yaffs_find_tnode_0(dev, &in->variant.fileVariant, chunkInInode); if (tn) { - theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode); + theChunk = yaffs_get_group_base(dev, tn, chunkInInode); retVal = - yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId, + yaffs_find_chunk_in_group(dev, theChunk, tags, in->objectId, chunkInInode); } return retVal; } -static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode, +static int yaffs_find_del_file_chunk(yaffs_Object *in, int chunkInInode, yaffs_ExtendedTags *tags) { /* Get the Tnode, then get the level 0 offset chunk offset */ @@ -2700,26 +2700,26 @@ static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode, tags = &localTags; } - tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode); + tn = yaffs_find_tnode_0(dev, &in->variant.fileVariant, chunkInInode); if (tn) { - theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode); + theChunk = yaffs_get_group_base(dev, tn, chunkInInode); retVal = - yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId, + yaffs_find_chunk_in_group(dev, theChunk, tags, in->objectId, chunkInInode); /* Delete the entry in the filestructure (if found) */ if (retVal != -1) - yaffs_LoadLevel0Tnode(dev, tn, chunkInInode, 0); + yaffs_load_tnode_0(dev, tn, chunkInInode, 0); } return retVal; } -int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode, +int yaffs_put_chunk_in_file(yaffs_Object *in, int chunkInInode, int chunkInNAND, int inScan) { /* NB inScan is zero unless scanning. @@ -2748,11 +2748,11 @@ int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode, YBUG(); } - yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__); + yaffs_chunk_del(dev, chunkInNAND, 1, __LINE__); return YAFFS_OK; } - tn = yaffs_AddOrFindLevel0Tnode(dev, + tn = yaffs_add_find_tnode_0(dev, &in->variant.fileVariant, chunkInInode, NULL); @@ -2763,7 +2763,7 @@ int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode, /* Dummy insert, bail now */ return YAFFS_OK; - existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode); + existingChunk = yaffs_get_group_base(dev, tn, chunkInInode); if (inScan != 0) { /* If we're scanning then we need to test for duplicates @@ -2788,13 +2788,13 @@ int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode, if (inScan > 0) { /* Only do this for forward scanning */ - yaffs_ReadChunkWithTagsFromNAND(dev, + yaffs_rd_chunk_tags_nand(dev, chunkInNAND, NULL, &newTags); /* Do a proper find */ existingChunk = - yaffs_FindChunkInFile(in, chunkInInode, + yaffs_find_chunk_in_file(in, chunkInInode, &existingTags); } @@ -2824,14 +2824,14 @@ int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode, * Use new * Delete the old one and drop through to update the tnode */ - yaffs_DeleteChunk(dev, existingChunk, 1, + yaffs_chunk_del(dev, existingChunk, 1, __LINE__); } else { /* Backward scanning or we want to use the existing one * Use existing. * Delete the new one and return early so that the tnode isn't changed */ - yaffs_DeleteChunk(dev, chunkInNAND, 1, + yaffs_chunk_del(dev, chunkInNAND, 1, __LINE__); return YAFFS_OK; } @@ -2842,18 +2842,18 @@ int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode, if (existingChunk == 0) in->nDataChunks++; - yaffs_LoadLevel0Tnode(dev, tn, chunkInInode, chunkInNAND); + yaffs_load_tnode_0(dev, tn, chunkInInode, chunkInNAND); return YAFFS_OK; } -static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode, +static int yaffs_rd_data_obj(yaffs_Object *in, int chunkInInode, __u8 *buffer) { - int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL); + int chunkInNAND = yaffs_find_chunk_in_file(in, chunkInInode, NULL); if (chunkInNAND >= 0) - return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND, + return yaffs_rd_chunk_tags_nand(in->myDev, chunkInNAND, buffer, NULL); else { T(YAFFS_TRACE_NANDACCESS, @@ -2866,7 +2866,7 @@ static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode, } -void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn) +void yaffs_chunk_del(yaffs_Device *dev, int chunkId, int markNAND, int lyn) { int block; int page; @@ -2881,14 +2881,14 @@ void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn) page = chunkId % dev->param.nChunksPerBlock; - if (!yaffs_CheckChunkBit(dev, block, page)) + if (!yaffs_check_chunk_bit(dev, block, page)) T(YAFFS_TRACE_VERIFY, (TSTR("Deleting invalid chunk %d"TENDSTR), chunkId)); - bi = yaffs_GetBlockInfo(dev, block); + bi = yaffs_get_block_info(dev, block); - yaffs2_UpdateOldestDirtySequence(dev, block, bi); + yaffs2_update_oldest_dirty_seq(dev, block, bi); T(YAFFS_TRACE_DELETION, (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunkId)); @@ -2896,12 +2896,12 @@ void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn) if (!dev->param.isYaffs2 && markNAND && bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) { - yaffs_InitialiseTags(&tags); + yaffs_init_tags(&tags); tags.chunkDeleted = 1; - yaffs_WriteChunkWithTagsToNAND(dev, chunkId, NULL, &tags); - yaffs_HandleUpdateChunk(dev, chunkId, &tags); + yaffs_wr_chunk_tags_nand(dev, chunkId, NULL, &tags); + yaffs_handle_chunk_update(dev, chunkId, &tags); } else { dev->nUnmarkedDeletions++; } @@ -2915,7 +2915,7 @@ void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn) bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) { dev->nFreeChunks++; - yaffs_ClearChunkBit(dev, block, page); + yaffs_clear_chunk_bit(dev, block, page); bi->pagesInUse--; @@ -2923,14 +2923,14 @@ void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn) !bi->hasShrinkHeader && bi->blockState != YAFFS_BLOCK_STATE_ALLOCATING && bi->blockState != YAFFS_BLOCK_STATE_NEEDS_SCANNING) { - yaffs_BlockBecameDirty(dev, block); + yaffs_block_became_dirty(dev, block); } } } -static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode, +static int yaffs_wr_data_obj(yaffs_Object *in, int chunkInInode, const __u8 *buffer, int nBytes, int useReserve) { @@ -2947,19 +2947,19 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode, yaffs_Device *dev = in->myDev; - yaffs_CheckGarbageCollection(dev,0); + yaffs_check_gc(dev,0); /* Get the previous chunk at this location in the file if it exists. * 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_FindChunkInFile(in, chunkInInode, &prevTags); + prevChunkId = yaffs_find_chunk_in_file(in, chunkInInode, &prevTags); if(prevChunkId < 1 && - !yaffs_PutChunkIntoFile(in, chunkInInode, 0, 0)) + !yaffs_put_chunk_in_file(in, chunkInInode, 0, 0)) return 0; /* Set up new tags */ - yaffs_InitialiseTags(&newTags); + yaffs_init_tags(&newTags); newTags.chunkId = chunkInInode; newTags.objectId = in->objectId; @@ -2975,16 +2975,16 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode, newChunkId = - yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags, + yaffs_write_new_chunk(dev, buffer, &newTags, useReserve); if (newChunkId > 0) { - yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0); + yaffs_put_chunk_in_file(in, chunkInInode, newChunkId, 0); if (prevChunkId > 0) - yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__); + yaffs_chunk_del(dev, prevChunkId, 1, __LINE__); - yaffs_VerifyFileSanity(in); + yaffs_verify_file_sane(in); } return newChunkId; @@ -2993,8 +2993,8 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode, /* UpdateObjectHeader updates the header on NAND for an object. * If name is not NULL, then that new name is used. */ -int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force, - int isShrink, int shadows, yaffs_XAttrMod *xmod) +int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force, + int isShrink, int shadows, yaffs_xattr_mod *xmod) { yaffs_BlockInfo *bi; @@ -3022,19 +3022,19 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force, in == dev->rootDir || /* The rootDir should also be saved */ force || xmod) { - yaffs_CheckGarbageCollection(dev,0); - yaffs_CheckObjectDetailsLoaded(in); + yaffs_check_gc(dev,0); + yaffs_check_obj_details_loaded(in); - buffer = yaffs_GetTempBuffer(in->myDev, __LINE__); + buffer = yaffs_get_temp_buffer(in->myDev, __LINE__); oh = (yaffs_ObjectHeader *) buffer; prevChunkId = in->hdrChunk; if (prevChunkId > 0) { - result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId, + result = yaffs_rd_chunk_tags_nand(dev, prevChunkId, buffer, &oldTags); - yaffs_VerifyObjectHeader(in, oh, &oldTags, 0); + yaffs_verify_oh(in, oh, &oldTags, 0); memcpy(oldName, oh->name, sizeof(oh->name)); memset(buffer, 0xFF, sizeof(yaffs_ObjectHeader)); @@ -3067,7 +3067,7 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force, if (name && *name) { memset(oh->name, 0, sizeof(oh->name)); - yaffs_LoadObjectHeaderFromName(dev,oh->name,name); + yaffs_load_oh_from_name(dev,oh->name,name); } else if (prevChunkId > 0) memcpy(oh->name, oldName, sizeof(oh->name)); else @@ -3109,11 +3109,11 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force, /* process any xattrib modifications */ if(xmod) - yaffs_ApplyXMod(in, (char *)buffer, xmod); + yaffs_apply_xattrib_mod(in, (char *)buffer, xmod); /* Tags */ - yaffs_InitialiseTags(&newTags); + yaffs_init_tags(&newTags); in->serial++; newTags.chunkId = 0; newTags.objectId = in->objectId; @@ -3129,11 +3129,11 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force, newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0; newTags.extraObjectType = in->variantType; - yaffs_VerifyObjectHeader(in, oh, &newTags, 1); + yaffs_verify_oh(in, oh, &newTags, 1); /* Create new chunk in NAND */ newChunkId = - yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags, + yaffs_write_new_chunk(dev, buffer, &newTags, (prevChunkId > 0) ? 1 : 0); if (newChunkId >= 0) { @@ -3141,16 +3141,16 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force, in->hdrChunk = newChunkId; if (prevChunkId > 0) { - yaffs_DeleteChunk(dev, prevChunkId, 1, + yaffs_chunk_del(dev, prevChunkId, 1, __LINE__); } - if (!yaffs_ObjectHasCachedWriteData(in)) + if (!yaffs_obj_cache_dirty(in)) in->dirty = 0; /* If this was a shrink, then mark the block that the chunk lives on */ if (isShrink) { - bi = yaffs_GetBlockInfo(in->myDev, + bi = yaffs_get_block_info(in->myDev, newChunkId / in->myDev->param.nChunksPerBlock); bi->hasShrinkHeader = 1; } @@ -3162,7 +3162,7 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force, } if (buffer) - yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); + yaffs_release_temp_buffer(dev, buffer, __LINE__); return retVal; } @@ -3180,7 +3180,7 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force, * need a very intelligent search. */ -static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj) +static int yaffs_obj_cache_dirty(yaffs_Object *obj) { yaffs_Device *dev = obj->myDev; int i; @@ -3198,7 +3198,7 @@ static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj) } -static void yaffs_FlushFilesChunkCache(yaffs_Object *obj) +static void yaffs_flush_file_cache(yaffs_Object *obj) { yaffs_Device *dev = obj->myDev; int lowest = -99; /* Stop compiler whining. */ @@ -3228,7 +3228,7 @@ static void yaffs_FlushFilesChunkCache(yaffs_Object *obj) /* Write it out and free it up */ chunkWritten = - yaffs_WriteChunkDataToObject(cache->object, + yaffs_wr_data_obj(cache->object, cache->chunkId, cache->data, cache->nBytes, @@ -3249,12 +3249,12 @@ static void yaffs_FlushFilesChunkCache(yaffs_Object *obj) } -/*yaffs_FlushEntireDeviceCache(dev) +/*yaffs_flush_whole_cache(dev) * * */ -void yaffs_FlushEntireDeviceCache(yaffs_Device *dev) +void yaffs_flush_whole_cache(yaffs_Device *dev) { yaffs_Object *obj; int nCaches = dev->param.nShortOpCaches; @@ -3272,7 +3272,7 @@ void yaffs_FlushEntireDeviceCache(yaffs_Device *dev) } if (obj) - yaffs_FlushFilesChunkCache(obj); + yaffs_flush_file_cache(obj); } while (obj); @@ -3284,7 +3284,7 @@ void yaffs_FlushEntireDeviceCache(yaffs_Device *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_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev) +static yaffs_ChunkCache *yaffs_grab_chunk_worker(yaffs_Device *dev) { int i; @@ -3298,7 +3298,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev) return NULL; } -static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev) +static yaffs_ChunkCache *yaffs_grab_chunk_cache(yaffs_Device *dev) { yaffs_ChunkCache *cache; yaffs_Object *theObj; @@ -3309,7 +3309,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev) if (dev->param.nShortOpCaches > 0) { /* Try find a non-dirty one... */ - cache = yaffs_GrabChunkCacheWorker(dev); + cache = yaffs_grab_chunk_worker(dev); if (!cache) { /* They were all dirty, find the last recently used object and flush @@ -3338,8 +3338,8 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev) if (!cache || cache->dirty) { /* Flush and try again */ - yaffs_FlushFilesChunkCache(theObj); - cache = yaffs_GrabChunkCacheWorker(dev); + yaffs_flush_file_cache(theObj); + cache = yaffs_grab_chunk_worker(dev); } } @@ -3350,7 +3350,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev) } /* Find a cached chunk */ -static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj, +static yaffs_ChunkCache *yaffs_find_chunk_cache(const yaffs_Object *obj, int chunkId) { yaffs_Device *dev = obj->myDev; @@ -3369,7 +3369,7 @@ static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj, } /* Mark the chunk for the least recently used algorithym */ -static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache, +static void yaffs_use_cache(yaffs_Device *dev, yaffs_ChunkCache *cache, int isAWrite) { @@ -3396,10 +3396,10 @@ static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache, * Do this when a whole page gets written, * ie the short cache for this page is no longer valid. */ -static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId) +static void yaffs_invalidate_chunk_cache(yaffs_Object *object, int chunkId) { if (object->myDev->param.nShortOpCaches > 0) { - yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId); + yaffs_ChunkCache *cache = yaffs_find_chunk_cache(object, chunkId); if (cache) cache->object = NULL; @@ -3409,7 +3409,7 @@ static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId) /* Invalidate all the cache pages associated with this object * Do this whenever ther file is deleted or resized. */ -static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in) +static void yaffs_invalidate_whole_cache(yaffs_Object *in) { int i; yaffs_Device *dev = in->myDev; @@ -3434,7 +3434,7 @@ static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in) * Curve-balls: the first chunk might also be the last chunk. */ -int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset, +int yaffs_file_rd(yaffs_Object *in, __u8 *buffer, loff_t offset, int nBytes) { @@ -3452,7 +3452,7 @@ int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset, while (n > 0) { /* chunk = offset / dev->nDataBytesPerChunk + 1; */ /* start = offset % dev->nDataBytesPerChunk; */ - yaffs_AddrToChunk(dev, offset, &chunk, &start); + yaffs_addr_to_chunk(dev, offset, &chunk, &start); chunk++; /* OK now check for the curveball where the start and end are in @@ -3463,7 +3463,7 @@ int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset, else nToCopy = dev->nDataBytesPerChunk - start; - cache = yaffs_FindChunkCache(in, chunk); + cache = yaffs_find_chunk_cache(in, chunk); /* If the chunk is already in the cache or it is less than a whole chunk * or we're using inband tags then use the cache (if there is caching) @@ -3475,18 +3475,18 @@ int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset, /* If we can't find the data in the cache, then load it up. */ if (!cache) { - cache = yaffs_GrabChunkCache(in->myDev); + cache = yaffs_grab_chunk_cache(in->myDev); cache->object = in; cache->chunkId = chunk; cache->dirty = 0; cache->locked = 0; - yaffs_ReadChunkDataFromObject(in, chunk, + yaffs_rd_data_obj(in, chunk, cache-> data); cache->nBytes = 0; } - yaffs_UseChunkCache(dev, cache, 0); + yaffs_use_cache(dev, cache, 0); cache->locked = 1; @@ -3498,21 +3498,21 @@ int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset, /* Read into the local buffer then copy..*/ __u8 *localBuffer = - yaffs_GetTempBuffer(dev, __LINE__); - yaffs_ReadChunkDataFromObject(in, chunk, + yaffs_get_temp_buffer(dev, __LINE__); + yaffs_rd_data_obj(in, chunk, localBuffer); memcpy(buffer, &localBuffer[start], nToCopy); - yaffs_ReleaseTempBuffer(dev, localBuffer, + yaffs_release_temp_buffer(dev, localBuffer, __LINE__); } } else { /* A full chunk. Read directly into the supplied buffer. */ - yaffs_ReadChunkDataFromObject(in, chunk, buffer); + yaffs_rd_data_obj(in, chunk, buffer); } @@ -3526,7 +3526,7 @@ int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset, return nDone; } -int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, +int yaffs_do_file_wr(yaffs_Object *in, const __u8 *buffer, loff_t offset, int nBytes, int writeThrough) { @@ -3546,7 +3546,7 @@ int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, dev = in->myDev; while (n > 0 && chunkWritten >= 0) { - yaffs_AddrToChunk(dev, offset, &chunk, &start); + yaffs_addr_to_chunk(dev, offset, &chunk, &start); if (chunk * dev->nDataBytesPerChunk + start != offset || start >= dev->nDataBytesPerChunk) { @@ -3598,20 +3598,20 @@ int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, if (dev->param.nShortOpCaches > 0) { yaffs_ChunkCache *cache; /* If we can't find the data in the cache, then load the cache */ - cache = yaffs_FindChunkCache(in, chunk); + cache = yaffs_find_chunk_cache(in, chunk); if (!cache - && yaffs_CheckSpaceForAllocation(dev, 1)) { - cache = yaffs_GrabChunkCache(dev); + && yaffs_check_alloc_available(dev, 1)) { + cache = yaffs_grab_chunk_cache(dev); cache->object = in; cache->chunkId = chunk; cache->dirty = 0; cache->locked = 0; - yaffs_ReadChunkDataFromObject(in, chunk, + yaffs_rd_data_obj(in, chunk, cache->data); } else if (cache && !cache->dirty && - !yaffs_CheckSpaceForAllocation(dev, 1)) { + !yaffs_check_alloc_available(dev, 1)) { /* Drop the cache if it was a read cache item and * no space check has been made for it. */ @@ -3619,7 +3619,7 @@ int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, } if (cache) { - yaffs_UseChunkCache(dev, cache, 1); + yaffs_use_cache(dev, cache, 1); cache->locked = 1; @@ -3632,7 +3632,7 @@ int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, if (writeThrough) { chunkWritten = - yaffs_WriteChunkDataToObject + yaffs_wr_data_obj (cache->object, cache->chunkId, cache->data, cache->nBytes, @@ -3649,9 +3649,9 @@ int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, */ __u8 *localBuffer = - yaffs_GetTempBuffer(dev, __LINE__); + yaffs_get_temp_buffer(dev, __LINE__); - yaffs_ReadChunkDataFromObject(in, chunk, + yaffs_rd_data_obj(in, chunk, localBuffer); @@ -3659,12 +3659,12 @@ int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, memcpy(&localBuffer[start], buffer, nToCopy); chunkWritten = - yaffs_WriteChunkDataToObject(in, chunk, + yaffs_wr_data_obj(in, chunk, localBuffer, nToWriteBack, 0); - yaffs_ReleaseTempBuffer(dev, localBuffer, + yaffs_release_temp_buffer(dev, localBuffer, __LINE__); } @@ -3675,12 +3675,12 @@ int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, chunkWritten = - yaffs_WriteChunkDataToObject(in, chunk, buffer, + yaffs_wr_data_obj(in, chunk, buffer, dev->nDataBytesPerChunk, 0); /* Since we've overwritten the cached data, we better invalidate it. */ - yaffs_InvalidateChunkCache(in, chunk); + yaffs_invalidate_chunk_cache(in, chunk); } if (chunkWritten >= 0) { @@ -3702,18 +3702,18 @@ int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, return nDone; } -int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, +int yaffs_wr_file(yaffs_Object *in, const __u8 *buffer, loff_t offset, int nBytes, int writeThrough) { - yaffs2_HandleHole(in,offset); - return yaffs_DoWriteDataToFile(in,buffer,offset,nBytes,writeThrough); + yaffs2_handle_hole(in,offset); + return yaffs_do_file_wr(in,buffer,offset,nBytes,writeThrough); } /* ---------------------- File resizing stuff ------------------ */ -static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize) +static void yaffs_prune_chunks(yaffs_Object *in, int newSize) { yaffs_Device *dev = in->myDev; @@ -3732,10 +3732,10 @@ static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize) for (i = lastDel; i >= startDel; i--) { /* NB this could be optimised somewhat, * eg. could retrieve the tags and write them without - * using yaffs_DeleteChunk + * using yaffs_chunk_del */ - chunkId = yaffs_FindAndDeleteChunkInFile(in, i, NULL); + chunkId = yaffs_find_del_file_chunk(in, i, NULL); if (chunkId > 0) { if (chunkId < (dev->internalStartBlock * dev->param.nChunksPerBlock) @@ -3747,7 +3747,7 @@ static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize) chunkId, i)); } else { in->nDataChunks--; - yaffs_DeleteChunk(dev, chunkId, 1, __LINE__); + yaffs_chunk_del(dev, chunkId, 1, __LINE__); } } } @@ -3755,46 +3755,46 @@ static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize) } -void yaffs_ResizeDown( yaffs_Object *obj, loff_t newSize) +void yaffs_resize_file_down( yaffs_Object *obj, loff_t newSize) { int newFullChunks; __u32 newSizeOfPartialChunk; yaffs_Device *dev = obj->myDev; - yaffs_AddrToChunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk); + yaffs_addr_to_chunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk); - yaffs_PruneResizedChunks(obj, newSize); + yaffs_prune_chunks(obj, newSize); if (newSizeOfPartialChunk != 0) { int lastChunk = 1 + newFullChunks; - __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__); + __u8 *localBuffer = yaffs_get_temp_buffer(dev, __LINE__); /* Got to read and rewrite the last chunk with its new size and zero pad */ - yaffs_ReadChunkDataFromObject(obj, lastChunk, localBuffer); + yaffs_rd_data_obj(obj, lastChunk, localBuffer); memset(localBuffer + newSizeOfPartialChunk, 0, dev->nDataBytesPerChunk - newSizeOfPartialChunk); - yaffs_WriteChunkDataToObject(obj, lastChunk, localBuffer, + yaffs_wr_data_obj(obj, lastChunk, localBuffer, newSizeOfPartialChunk, 1); - yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__); + yaffs_release_temp_buffer(dev, localBuffer, __LINE__); } obj->variant.fileVariant.fileSize = newSize; - yaffs_PruneFileStructure(dev, &obj->variant.fileVariant); + yaffs_prune_tree(dev, &obj->variant.fileVariant); } -int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize) +int yaffs_resize_file(yaffs_Object *in, loff_t newSize) { yaffs_Device *dev = in->myDev; int oldFileSize = in->variant.fileVariant.fileSize; - yaffs_FlushFilesChunkCache(in); - yaffs_InvalidateWholeChunkCache(in); + yaffs_flush_file_cache(in); + yaffs_invalidate_whole_cache(in); - yaffs_CheckGarbageCollection(dev,0); + yaffs_check_gc(dev,0); if (in->variantType != YAFFS_OBJECT_TYPE_FILE) return YAFFS_FAIL; @@ -3803,11 +3803,11 @@ int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize) return YAFFS_OK; if(newSize > oldFileSize){ - yaffs2_HandleHole(in,newSize); + yaffs2_handle_hole(in,newSize); in->variant.fileVariant.fileSize = newSize; } else { /* newSize < oldFileSize */ - yaffs_ResizeDown(in, newSize); + yaffs_resize_file_down(in, newSize); } /* Write a new object header to reflect the resize. @@ -3819,16 +3819,16 @@ int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize) !in->isShadowed && in->parent->objectId != YAFFS_OBJECTID_UNLINKED && in->parent->objectId != YAFFS_OBJECTID_DELETED) - yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0, NULL); + yaffs_update_oh(in, NULL, 0, 0, 0, NULL); return YAFFS_OK; } -loff_t yaffs_GetFileSize(yaffs_Object *obj) +loff_t yaffs_get_file_size(yaffs_Object *obj) { YCHAR *alias = NULL; - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); switch (obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: @@ -3845,11 +3845,11 @@ loff_t yaffs_GetFileSize(yaffs_Object *obj) -int yaffs_FlushFile(yaffs_Object *in, int updateTime, int dataSync) +int yaffs_flush_file(yaffs_Object *in, int updateTime, int dataSync) { int retVal; if (in->dirty) { - yaffs_FlushFilesChunkCache(in); + yaffs_flush_file_cache(in); if(dataSync) /* Only sync data */ retVal=YAFFS_OK; else { @@ -3863,7 +3863,7 @@ int yaffs_FlushFile(yaffs_Object *in, int updateTime, int dataSync) #endif } - retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0, NULL) >= + retVal = (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >= 0) ? YAFFS_OK : YAFFS_FAIL; } } else { @@ -3874,32 +3874,32 @@ int yaffs_FlushFile(yaffs_Object *in, int updateTime, int dataSync) } -static int yaffs_DoGenericObjectDeletion(yaffs_Object *in) +static int yaffs_generic_obj_del(yaffs_Object *in) { /* First off, invalidate the file's data in the cache, without flushing. */ - yaffs_InvalidateWholeChunkCache(in); + yaffs_invalidate_whole_cache(in); if (in->myDev->param.isYaffs2 && (in->parent != in->myDev->deletedDir)) { /* Move to the unlinked directory so we have a record that it was deleted. */ - yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0); + yaffs_change_obj_name(in, in->myDev->deletedDir, _Y("deleted"), 0, 0); } - yaffs_RemoveObjectFromDirectory(in); - yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__); + yaffs_remove_obj_from_dir(in); + yaffs_chunk_del(in->myDev, in->hdrChunk, 1, __LINE__); in->hdrChunk = 0; - yaffs_FreeObject(in); + yaffs_free_obj(in); return YAFFS_OK; } -/* yaffs_DeleteFile deletes the whole file data +/* yaffs_del_file deletes the whole file data * and the inode associated with the file. * It does not delete the links associated with the file. */ -static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in) +static int yaffs_unlink_file_if_needed(yaffs_Object *in) { int retVal; @@ -3911,7 +3911,7 @@ static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in) if (immediateDeletion) { retVal = - yaffs_ChangeObjectName(in, in->myDev->deletedDir, + yaffs_change_obj_name(in, in->myDev->deletedDir, _Y("deleted"), 0, 0); T(YAFFS_TRACE_TRACING, (TSTR("yaffs: immediate deletion of file %d" TENDSTR), @@ -3919,11 +3919,11 @@ static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in) in->deleted = 1; in->myDev->nDeletedFiles++; if (dev->param.disableSoftDelete || dev->param.isYaffs2) - yaffs_ResizeFile(in, 0); - yaffs_SoftDeleteFile(in); + yaffs_resize_file(in, 0); + yaffs_soft_del_file(in); } else { retVal = - yaffs_ChangeObjectName(in, in->myDev->unlinkedDir, + yaffs_change_obj_name(in, in->myDev->unlinkedDir, _Y("unlinked"), 0, 0); } @@ -3931,21 +3931,21 @@ static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in) return retVal; } -int yaffs_DeleteFile(yaffs_Object *in) +int yaffs_del_file(yaffs_Object *in) { int retVal = YAFFS_OK; int deleted; /* Need to cache value on stack if in is freed */ yaffs_Device *dev = in->myDev; if (dev->param.disableSoftDelete || dev->param.isYaffs2) - yaffs_ResizeFile(in, 0); + yaffs_resize_file(in, 0); if (in->nDataChunks > 0) { /* Use soft deletion if there is data in the file. * That won't be the case if it has been resized to zero. */ if (!in->unlinked) - retVal = yaffs_UnlinkFileIfNeeded(in); + retVal = yaffs_unlink_file_if_needed(in); deleted = in->deleted; @@ -3953,74 +3953,74 @@ int yaffs_DeleteFile(yaffs_Object *in) in->deleted = 1; deleted = 1; in->myDev->nDeletedFiles++; - yaffs_SoftDeleteFile(in); + yaffs_soft_del_file(in); } return deleted ? YAFFS_OK : YAFFS_FAIL; } else { /* The file has no data chunks so we toss it immediately */ - yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top); + yaffs_free_tnode(in->myDev, in->variant.fileVariant.top); in->variant.fileVariant.top = NULL; - yaffs_DoGenericObjectDeletion(in); + yaffs_generic_obj_del(in); return YAFFS_OK; } } -static int yaffs_IsNonEmptyDirectory(yaffs_Object *obj) +static int yaffs_is_non_empty_dir(yaffs_Object *obj) { return (obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) && !(ylist_empty(&obj->variant.directoryVariant.children)); } -static int yaffs_DeleteDirectory(yaffs_Object *obj) +static int yaffs_del_dir(yaffs_Object *obj) { /* First check that the directory is empty. */ - if (yaffs_IsNonEmptyDirectory(obj)) + if (yaffs_is_non_empty_dir(obj)) return YAFFS_FAIL; - return yaffs_DoGenericObjectDeletion(obj); + return yaffs_generic_obj_del(obj); } -static int yaffs_DeleteSymLink(yaffs_Object *in) +static int yaffs_del_symlink(yaffs_Object *in) { if(in->variant.symLinkVariant.alias) YFREE(in->variant.symLinkVariant.alias); in->variant.symLinkVariant.alias=NULL; - return yaffs_DoGenericObjectDeletion(in); + return yaffs_generic_obj_del(in); } -static int yaffs_DeleteHardLink(yaffs_Object *in) +static int yaffs_del_link(yaffs_Object *in) { /* remove this hardlink from the list assocaited with the equivalent * object */ ylist_del_init(&in->hardLinks); - return yaffs_DoGenericObjectDeletion(in); + return yaffs_generic_obj_del(in); } -int yaffs_DeleteObject(yaffs_Object *obj) +int yaffs_del_obj(yaffs_Object *obj) { int retVal = -1; switch (obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: - retVal = yaffs_DeleteFile(obj); + retVal = yaffs_del_file(obj); break; case YAFFS_OBJECT_TYPE_DIRECTORY: if(!ylist_empty(&obj->variant.directoryVariant.dirty)){ T(YAFFS_TRACE_BACKGROUND, (TSTR("Remove object %d from dirty directories" TENDSTR),obj->objectId)); ylist_del_init(&obj->variant.directoryVariant.dirty); } - return yaffs_DeleteDirectory(obj); + return yaffs_del_dir(obj); break; case YAFFS_OBJECT_TYPE_SYMLINK: - retVal = yaffs_DeleteSymLink(obj); + retVal = yaffs_del_symlink(obj); break; case YAFFS_OBJECT_TYPE_HARDLINK: - retVal = yaffs_DeleteHardLink(obj); + retVal = yaffs_del_link(obj); break; case YAFFS_OBJECT_TYPE_SPECIAL: - retVal = yaffs_DoGenericObjectDeletion(obj); + retVal = yaffs_generic_obj_del(obj); break; case YAFFS_OBJECT_TYPE_UNKNOWN: retVal = 0; @@ -4030,7 +4030,7 @@ int retVal = -1; return retVal; } -static int yaffs_UnlinkWorker(yaffs_Object *obj) +static int yaffs_unlink_worker(yaffs_Object *obj) { int immediateDeletion = 0; @@ -4039,10 +4039,10 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj) immediateDeletion = 1; if(obj) - yaffs_UpdateParent(obj->parent); + yaffs_update_parent(obj->parent); if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { - return yaffs_DeleteHardLink(obj); + return yaffs_del_link(obj); } else if (!ylist_empty(&obj->hardLinks)) { /* Curve ball: We're unlinking an object that has a hardlink. * @@ -4065,53 +4065,53 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj) hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks); - yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1); + yaffs_get_obj_name(hl, name, YAFFS_MAX_NAME_LENGTH + 1); parent = hl->parent; ylist_del_init(&hl->hardLinks); - yaffs_AddObjectToDirectory(obj->myDev->unlinkedDir, hl); + yaffs_add_obj_to_dir(obj->myDev->unlinkedDir, hl); - retVal = yaffs_ChangeObjectName(obj,parent, name, 0, 0); + retVal = yaffs_change_obj_name(obj,parent, name, 0, 0); if (retVal == YAFFS_OK) - retVal = yaffs_DoGenericObjectDeletion(hl); + retVal = yaffs_generic_obj_del(hl); return retVal; } else if (immediateDeletion) { switch (obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: - return yaffs_DeleteFile(obj); + return yaffs_del_file(obj); break; case YAFFS_OBJECT_TYPE_DIRECTORY: ylist_del_init(&obj->variant.directoryVariant.dirty); - return yaffs_DeleteDirectory(obj); + return yaffs_del_dir(obj); break; case YAFFS_OBJECT_TYPE_SYMLINK: - return yaffs_DeleteSymLink(obj); + return yaffs_del_symlink(obj); break; case YAFFS_OBJECT_TYPE_SPECIAL: - return yaffs_DoGenericObjectDeletion(obj); + return yaffs_generic_obj_del(obj); break; case YAFFS_OBJECT_TYPE_HARDLINK: case YAFFS_OBJECT_TYPE_UNKNOWN: default: return YAFFS_FAIL; } - } else if(yaffs_IsNonEmptyDirectory(obj)) + } else if(yaffs_is_non_empty_dir(obj)) return YAFFS_FAIL; else - return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir, + return yaffs_change_obj_name(obj, obj->myDev->unlinkedDir, _Y("unlinked"), 0, 0); } -static int yaffs_UnlinkObject(yaffs_Object *obj) +static int yaffs_unlink_obj(yaffs_Object *obj) { if (obj && obj->unlinkAllowed) - return yaffs_UnlinkWorker(obj); + return yaffs_unlink_worker(obj); return YAFFS_FAIL; @@ -4120,13 +4120,13 @@ int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name) { yaffs_Object *obj; - obj = yaffs_FindObjectByName(dir, name); - return yaffs_UnlinkObject(obj); + obj = yaffs_find_by_name(dir, name); + return yaffs_unlink_obj(obj); } /*----------------------- Initialisation Scanning ---------------------- */ -void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId, +void yaffs_handle_shadowed_obj(yaffs_Device *dev, int objId, int backwardScanning) { yaffs_Object *obj; @@ -4140,7 +4140,7 @@ void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId, /* Handle YAFFS2 case (backward scanning) * If the shadowed object exists then ignore. */ - obj = yaffs_FindObjectByNumber(dev, objId); + obj = yaffs_find_by_number(dev, objId); if(obj) return; } @@ -4149,19 +4149,19 @@ void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId, * We put it in unlinked dir to be cleaned up after the scanning */ obj = - yaffs_FindOrCreateObjectByNumber(dev, objId, + yaffs_find_or_create_by_number(dev, objId, YAFFS_OBJECT_TYPE_FILE); if (!obj) return; obj->isShadowed = 1; - yaffs_AddObjectToDirectory(dev->unlinkedDir, obj); + yaffs_add_obj_to_dir(dev->unlinkedDir, obj); obj->variant.fileVariant.shrinkSize = 0; obj->valid = 1; /* So that we don't read any other info for this file */ } -void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList) +void yaffs_link_fixup(yaffs_Device *dev, yaffs_Object *hardList) { yaffs_Object *hl; yaffs_Object *in; @@ -4170,7 +4170,7 @@ void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList) hl = hardList; hardList = (yaffs_Object *) (hardList->hardLinks.next); - in = yaffs_FindObjectByNumber(dev, + in = yaffs_find_by_number(dev, hl->variant.hardLinkVariant. equivalentObjectId); @@ -4190,7 +4190,7 @@ void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList) } -static void yaffs_StripDeletedObjects(yaffs_Device *dev) +static void yaffs_strip_deleted_objs(yaffs_Device *dev) { /* * Sort out state of unlinked and deleted objects after scanning. @@ -4207,7 +4207,7 @@ static void yaffs_StripDeletedObjects(yaffs_Device *dev) &dev->unlinkedDir->variant.directoryVariant.children) { if (i) { l = ylist_entry(i, yaffs_Object, siblings); - yaffs_DeleteObject(l); + yaffs_del_obj(l); } } @@ -4215,7 +4215,7 @@ static void yaffs_StripDeletedObjects(yaffs_Device *dev) &dev->deletedDir->variant.directoryVariant.children) { if (i) { l = ylist_entry(i, yaffs_Object, siblings); - yaffs_DeleteObject(l); + yaffs_del_obj(l); } } @@ -4238,14 +4238,14 @@ static void yaffs_StripDeletedObjects(yaffs_Device *dev) * leaving the object "hanging" without being rooted in the directory tree. */ -static int yaffs_HasNULLParent(yaffs_Device *dev, yaffs_Object *obj) +static int yaffs_has_null_parent(yaffs_Device *dev, yaffs_Object *obj) { return (obj == dev->deletedDir || obj == dev->unlinkedDir|| obj == dev->rootDir); } -static void yaffs_FixHangingObjects(yaffs_Device *dev) +static void yaffs_fix_hanging_objs(yaffs_Device *dev) { yaffs_Object *obj; yaffs_Object *parent; @@ -4269,13 +4269,13 @@ static void yaffs_FixHangingObjects(yaffs_Device *dev) obj = ylist_entry(lh, yaffs_Object, hashLink); parent= obj->parent; - if(yaffs_HasNULLParent(dev,obj)){ + if(yaffs_has_null_parent(dev,obj)){ /* These directories are not hanging */ hanging = 0; } else if(!parent || parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) hanging = 1; - else if(yaffs_HasNULLParent(dev,parent)) + else if(yaffs_has_null_parent(dev,parent)) hanging = 0; else { /* @@ -4298,7 +4298,7 @@ static void yaffs_FixHangingObjects(yaffs_Device *dev) T(YAFFS_TRACE_SCAN, (TSTR("Hanging object %d moved to lost and found" TENDSTR), obj->objectId)); - yaffs_AddObjectToDirectory(dev->lostNFoundDir,obj); + yaffs_add_obj_to_dir(dev->lostNFoundDir,obj); } } } @@ -4309,7 +4309,7 @@ static void yaffs_FixHangingObjects(yaffs_Device *dev) /* * Delete directory contents for cleaning up lost and found. */ -static void yaffs_DeleteDirectoryContents(yaffs_Object *dir) +static void yaffs_del_dir_contents(yaffs_Object *dir) { yaffs_Object *obj; struct ylist_head *lh; @@ -4322,7 +4322,7 @@ static void yaffs_DeleteDirectoryContents(yaffs_Object *dir) if (lh) { obj = ylist_entry(lh, yaffs_Object, siblings); if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) - yaffs_DeleteDirectoryContents(obj); + yaffs_del_dir_contents(obj); T(YAFFS_TRACE_SCAN, (TSTR("Deleting lost_found object %d" TENDSTR), @@ -4331,18 +4331,18 @@ static void yaffs_DeleteDirectoryContents(yaffs_Object *dir) /* Need to use UnlinkObject since Delete would not handle * hardlinked objects correctly. */ - yaffs_UnlinkObject(obj); + yaffs_unlink_obj(obj); } } } -static void yaffs_EmptyLostAndFound(yaffs_Device *dev) +static void yaffs_empty_l_n_f(yaffs_Device *dev) { - yaffs_DeleteDirectoryContents(dev->lostNFoundDir); + yaffs_del_dir_contents(dev->lostNFoundDir); } -static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in) +static void yaffs_check_obj_details_loaded(yaffs_Object *in) { __u8 *chunkData; yaffs_ObjectHeader *oh; @@ -4364,9 +4364,9 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in) if (in->lazyLoaded && in->hdrChunk > 0) { in->lazyLoaded = 0; - chunkData = yaffs_GetTempBuffer(dev, __LINE__); + chunkData = yaffs_get_temp_buffer(dev, __LINE__); - result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags); + result = yaffs_rd_chunk_tags_nand(dev, in->hdrChunk, chunkData, &tags); oh = (yaffs_ObjectHeader *) chunkData; in->yst_mode = oh->yst_mode; @@ -4386,23 +4386,23 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in) in->yst_rdev = oh->yst_rdev; #endif - yaffs_SetObjectNameFromOH(in, oh); + yaffs_set_obj_name_from_oh(in, oh); if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) { in->variant.symLinkVariant.alias = - yaffs_CloneString(oh->alias); + yaffs_clone_str(oh->alias); if (!in->variant.symLinkVariant.alias) alloc_failed = 1; /* Not returned to caller */ } - yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__); + yaffs_release_temp_buffer(dev, chunkData, __LINE__); } } /*------------------------------ Directory Functions ----------------------------- */ /* - *yaffs_UpdateParent() handles fixing a directories mtime and ctime when a new + *yaffs_update_parent() handles fixing a directories mtime and ctime when a new * link (ie. name) is created or deleted in the directory. * * ie. @@ -4413,11 +4413,11 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in) * This can be handled immediately or defered. Defering helps reduce the number * of updates when many files in a directory are changed within a brief period. * - * If the directory updating is defered then yaffs_UpdateDirtyDirecories must be + * If the directory updating is defered then yaffs_update_dirty_dirs must be * called periodically. */ -static void yaffs_UpdateParent(yaffs_Object *obj) +static void yaffs_update_parent(yaffs_Object *obj) { yaffs_Device *dev; if(!obj) @@ -4436,11 +4436,11 @@ static void yaffs_UpdateParent(yaffs_Object *obj) } } else - yaffs_UpdateObjectHeader(obj, NULL, 0, 0, 0, NULL); + yaffs_update_oh(obj, NULL, 0, 0, 0, NULL); #endif } -void yaffs_UpdateDirtyDirectories(yaffs_Device *dev) +void yaffs_update_dirty_dirs(yaffs_Device *dev) { struct ylist_head *link; yaffs_Object *obj; @@ -4460,19 +4460,19 @@ void yaffs_UpdateDirtyDirectories(yaffs_Device *dev) T(YAFFS_TRACE_BACKGROUND, (TSTR("Update directory %d" TENDSTR), obj->objectId)); if(obj->dirty) - yaffs_UpdateObjectHeader(obj, NULL, 0, 0, 0, NULL); + yaffs_update_oh(obj, NULL, 0, 0, 0, NULL); } } -static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj) +static void yaffs_remove_obj_from_dir(yaffs_Object *obj) { yaffs_Device *dev = obj->myDev; yaffs_Object *parent; - yaffs_VerifyObjectInDirectory(obj); + yaffs_verify_obj_in_dir(obj); parent = obj->parent; - yaffs_VerifyDirectory(parent); + yaffs_verify_dir(parent); if (dev && dev->param.removeObjectCallback) dev->param.removeObjectCallback(obj); @@ -4481,10 +4481,10 @@ static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj) ylist_del_init(&obj->siblings); obj->parent = NULL; - yaffs_VerifyDirectory(parent); + yaffs_verify_dir(parent); } -void yaffs_AddObjectToDirectory(yaffs_Object *directory, +void yaffs_add_obj_to_dir(yaffs_Object *directory, yaffs_Object *obj) { if (!directory) { @@ -4509,9 +4509,9 @@ void yaffs_AddObjectToDirectory(yaffs_Object *directory, } - yaffs_VerifyDirectory(directory); + yaffs_verify_dir(directory); - yaffs_RemoveObjectFromDirectory(obj); + yaffs_remove_obj_from_dir(obj); /* Now add it */ @@ -4525,11 +4525,11 @@ void yaffs_AddObjectToDirectory(yaffs_Object *directory, obj->renameAllowed = 0; } - yaffs_VerifyDirectory(directory); - yaffs_VerifyObjectInDirectory(obj); + yaffs_verify_dir(directory); + yaffs_verify_obj_in_dir(obj); } -yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory, +yaffs_Object *yaffs_find_by_name(yaffs_Object *directory, const YCHAR *name) { int sum; @@ -4545,7 +4545,7 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory, if (!directory) { T(YAFFS_TRACE_ALWAYS, (TSTR - ("tragedy: yaffs_FindObjectByName: null pointer directory" + ("tragedy: yaffs_find_by_name: null pointer directory" TENDSTR))); YBUG(); return NULL; @@ -4553,11 +4553,11 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory, if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { T(YAFFS_TRACE_ALWAYS, (TSTR - ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR))); + ("tragedy: yaffs_find_by_name: non-directory" TENDSTR))); YBUG(); } - sum = yaffs_CalcNameSum(name); + sum = yaffs_calc_name_sum(name); ylist_for_each(i, &directory->variant.directoryVariant.children) { if (i) { @@ -4566,17 +4566,17 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory, if (l->parent != directory) YBUG(); - yaffs_CheckObjectDetailsLoaded(l); + yaffs_check_obj_details_loaded(l); /* Special case for lost-n-found */ if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) { if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) return l; - } else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) { + } else if (yaffs_sum_cmp(l->sum, sum) || l->hdrChunk <= 0) { /* LostnFound chunk called Objxxx * Do a real check */ - yaffs_GetObjectName(l, buffer, + yaffs_get_obj_name(l, buffer, YAFFS_MAX_NAME_LENGTH + 1); if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0) return l; @@ -4598,7 +4598,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir, if (!theDir) { T(YAFFS_TRACE_ALWAYS, (TSTR - ("tragedy: yaffs_FindObjectByName: null pointer directory" + ("tragedy: yaffs_find_by_name: null pointer directory" TENDSTR))); YBUG(); return YAFFS_FAIL; @@ -4606,7 +4606,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir, if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { T(YAFFS_TRACE_ALWAYS, (TSTR - ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR))); + ("tragedy: yaffs_find_by_name: non-directory" TENDSTR))); YBUG(); return YAFFS_FAIL; } @@ -4628,12 +4628,12 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir, * actual object. */ -yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj) +yaffs_Object *yaffs_get_equivalent_obj(yaffs_Object *obj) { if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { /* We want the object id of the equivalent object, not this one */ obj = obj->variant.hardLinkVariant.equivalentObject; - yaffs_CheckObjectDetailsLoaded(obj); + yaffs_check_obj_details_loaded(obj); } return obj; } @@ -4657,7 +4657,7 @@ yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj) * starting at oh->name[1]. */ -static void yaffs_FixNullName(yaffs_Object * obj,YCHAR * name, int buffSize) +static void yaffs_fix_null_name(yaffs_Object * obj,YCHAR * name, int buffSize) { /* Create an object name if we could not find one. */ if(yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH) == 0){ @@ -4678,7 +4678,7 @@ static void yaffs_FixNullName(yaffs_Object * obj,YCHAR * name, int buffSize) } } -static void yaffs_LoadNameFromObjectHeader(yaffs_Device *dev,YCHAR *name, const YCHAR *ohName, int bufferSize) +static void yaffs_load_name_from_oh(yaffs_Device *dev,YCHAR *name, const YCHAR *ohName, int bufferSize) { #ifdef CONFIG_YAFFS_AUTO_UNICODE if(dev->param.autoUnicode){ @@ -4700,7 +4700,7 @@ static void yaffs_LoadNameFromObjectHeader(yaffs_Device *dev,YCHAR *name, const } -static void yaffs_LoadObjectHeaderFromName(yaffs_Device *dev, YCHAR *ohName, const YCHAR *name) +static void yaffs_load_oh_from_name(yaffs_Device *dev, YCHAR *ohName, const YCHAR *name) { #ifdef CONFIG_YAFFS_AUTO_UNICODE @@ -4741,11 +4741,11 @@ static void yaffs_LoadObjectHeaderFromName(yaffs_Device *dev, YCHAR *ohName, con } -int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize) +int yaffs_get_obj_name(yaffs_Object * obj, YCHAR * name, int buffSize) { memset(name, 0, buffSize * sizeof(YCHAR)); - yaffs_CheckObjectDetailsLoaded(obj); + yaffs_check_obj_details_loaded(obj); if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) { yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1); @@ -4757,32 +4757,32 @@ int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize) #endif else if(obj->hdrChunk > 0) { int result; - __u8 *buffer = yaffs_GetTempBuffer(obj->myDev, __LINE__); + __u8 *buffer = yaffs_get_temp_buffer(obj->myDev, __LINE__); yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *) buffer; memset(buffer, 0, obj->myDev->nDataBytesPerChunk); if (obj->hdrChunk > 0) { - result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev, + result = yaffs_rd_chunk_tags_nand(obj->myDev, obj->hdrChunk, buffer, NULL); } - yaffs_LoadNameFromObjectHeader(obj->myDev,name,oh->name,buffSize); + yaffs_load_name_from_oh(obj->myDev,name,oh->name,buffSize); - yaffs_ReleaseTempBuffer(obj->myDev, buffer, __LINE__); + yaffs_release_temp_buffer(obj->myDev, buffer, __LINE__); } - yaffs_FixNullName(obj,name,buffSize); + yaffs_fix_null_name(obj,name,buffSize); return yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH); } -int yaffs_GetObjectFileLength(yaffs_Object *obj) +int yaffs_get_obj_length(yaffs_Object *obj) { /* Dereference any hard linking */ - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) return obj->variant.fileVariant.fileSize; @@ -4796,7 +4796,7 @@ int yaffs_GetObjectFileLength(yaffs_Object *obj) } } -int yaffs_GetObjectLinkCount(yaffs_Object *obj) +int yaffs_get_obj_link_count(yaffs_Object *obj) { int count = 0; struct ylist_head *i; @@ -4810,16 +4810,16 @@ int yaffs_GetObjectLinkCount(yaffs_Object *obj) return count; } -int yaffs_GetObjectInode(yaffs_Object *obj) +int yaffs_get_obj_inode(yaffs_Object *obj) { - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); return obj->objectId; } -unsigned yaffs_GetObjectType(yaffs_Object *obj) +unsigned yaffs_get_obj_type(yaffs_Object *obj) { - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); switch (obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: @@ -4849,18 +4849,18 @@ unsigned yaffs_GetObjectType(yaffs_Object *obj) } } -YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj) +YCHAR *yaffs_get_symlink_alias(yaffs_Object *obj) { - obj = yaffs_GetEquivalentObject(obj); + obj = yaffs_get_equivalent_obj(obj); if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) - return yaffs_CloneString(obj->variant.symLinkVariant.alias); + return yaffs_clone_str(obj->variant.symLinkVariant.alias); else - return yaffs_CloneString(_Y("")); + return yaffs_clone_str(_Y("")); } #ifndef CONFIG_YAFFS_WINCE -int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr) +int yaffs_set_attribs(yaffs_Object *obj, struct iattr *attr) { unsigned int valid = attr->ia_valid; @@ -4879,14 +4879,14 @@ int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr) obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime); if (valid & ATTR_SIZE) - yaffs_ResizeFile(obj, attr->ia_size); + yaffs_resize_file(obj, attr->ia_size); - yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0, NULL); + yaffs_update_oh(obj, NULL, 1, 0, 0, NULL); return YAFFS_OK; } -int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr) +int yaffs_get_attribs(yaffs_Object *obj, struct iattr *attr) { unsigned int valid = 0; @@ -4904,7 +4904,7 @@ int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr) Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime; valid |= ATTR_MTIME; - attr->ia_size = yaffs_GetFileSize(obj); + attr->ia_size = yaffs_get_file_size(obj); valid |= ATTR_SIZE; attr->ia_valid = valid; @@ -4915,9 +4915,9 @@ int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr) #endif -static int yaffs_DoXMod(yaffs_Object *obj, int set, const YCHAR *name, const void *value, int size, int flags) +static int yaffs_do_xattrib_mod(yaffs_Object *obj, int set, const YCHAR *name, const void *value, int size, int flags) { - yaffs_XAttrMod xmod; + yaffs_xattr_mod xmod; int result; @@ -4928,7 +4928,7 @@ static int yaffs_DoXMod(yaffs_Object *obj, int set, const YCHAR *name, const voi xmod.flags = flags; xmod.result = -ENOSPC; - result = yaffs_UpdateObjectHeader(obj, NULL, 0, 0, 0, &xmod); + result = yaffs_update_oh(obj, NULL, 0, 0, 0, &xmod); if(result > 0) return xmod.result; @@ -4936,7 +4936,7 @@ static int yaffs_DoXMod(yaffs_Object *obj, int set, const YCHAR *name, const voi return -ENOSPC; } -static int yaffs_ApplyXMod(yaffs_Object *obj, char *buffer, yaffs_XAttrMod *xmod) +static int yaffs_apply_xattrib_mod(yaffs_Object *obj, char *buffer, yaffs_xattr_mod *xmod) { int retval = 0; int x_offs = sizeof(yaffs_ObjectHeader); @@ -4958,7 +4958,7 @@ static int yaffs_ApplyXMod(yaffs_Object *obj, char *buffer, yaffs_XAttrMod *xmod return retval; } -static int yaffs_DoXFetch(yaffs_Object *obj, const YCHAR *name, void *value, int size) +static int yaffs_do_xattrib_fetch(yaffs_Object *obj, const YCHAR *name, void *value, int size) { char *buffer = NULL; int result; @@ -4984,11 +4984,11 @@ static int yaffs_DoXFetch(yaffs_Object *obj, const YCHAR *name, void *value, int return 0; } - buffer = (char *) yaffs_GetTempBuffer(dev, __LINE__); + buffer = (char *) yaffs_get_temp_buffer(dev, __LINE__); if(!buffer) return -ENOMEM; - result = yaffs_ReadChunkWithTagsFromNAND(dev,obj->hdrChunk, (__u8 *)buffer, &tags); + result = yaffs_rd_chunk_tags_nand(dev,obj->hdrChunk, (__u8 *)buffer, &tags); if(result != YAFFS_OK) retval = -ENOENT; @@ -5005,46 +5005,46 @@ static int yaffs_DoXFetch(yaffs_Object *obj, const YCHAR *name, void *value, int else retval = nval_list(x_buffer, x_size, value,size); } - yaffs_ReleaseTempBuffer(dev,(__u8 *)buffer,__LINE__); + yaffs_release_temp_buffer(dev,(__u8 *)buffer,__LINE__); return retval; } -int yaffs_SetXAttribute(yaffs_Object *obj, const YCHAR *name, const void * value, int size, int flags) +int yaffs_set_xattrib(yaffs_Object *obj, const YCHAR *name, const void * value, int size, int flags) { - return yaffs_DoXMod(obj, 1, name, value, size, flags); + return yaffs_do_xattrib_mod(obj, 1, name, value, size, flags); } -int yaffs_RemoveXAttribute(yaffs_Object *obj, const YCHAR *name) +int yaffs_remove_xattrib(yaffs_Object *obj, const YCHAR *name) { - return yaffs_DoXMod(obj, 0, name, NULL, 0, 0); + return yaffs_do_xattrib_mod(obj, 0, name, NULL, 0, 0); } -int yaffs_GetXAttribute(yaffs_Object *obj, const YCHAR *name, void *value, int size) +int yaffs_get_xattrib(yaffs_Object *obj, const YCHAR *name, void *value, int size) { - return yaffs_DoXFetch(obj, name, value, size); + return yaffs_do_xattrib_fetch(obj, name, value, size); } -int yaffs_ListXAttributes(yaffs_Object *obj, char *buffer, int size) +int yaffs_list_xattrib(yaffs_Object *obj, char *buffer, int size) { - return yaffs_DoXFetch(obj, NULL, buffer,size); + return yaffs_do_xattrib_fetch(obj, NULL, buffer,size); } #if 0 -int yaffs_DumpObject(yaffs_Object *obj) +int yaffs_dump_obj(yaffs_Object *obj) { YCHAR name[257]; - yaffs_GetObjectName(obj, name, YAFFS_MAX_NAME_LENGTH + 1); + 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->objectId, yaffs_GetObjectInode(obj), name, + TENDSTR), obj->objectId, yaffs_get_obj_inode(obj), name, obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk, - yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj))); + yaffs_get_obj_type(obj), yaffs_get_obj_length(obj))); return YAFFS_OK; } @@ -5052,7 +5052,7 @@ int yaffs_DumpObject(yaffs_Object *obj) /*---------------------------- Initialisation code -------------------------------------- */ -static int yaffs_CheckDevFunctions(const yaffs_Device *dev) +static int yaffs_cehck_dev_fns(const yaffs_Device *dev) { /* Common functions, gotta have */ @@ -5085,7 +5085,7 @@ static int yaffs_CheckDevFunctions(const yaffs_Device *dev) } -static int yaffs_CreateInitialDirectories(yaffs_Device *dev) +static int yaffs_create_initial_dir(yaffs_Device *dev) { /* Initialise the unlinked, deleted, root and lost and found directories */ @@ -5093,33 +5093,33 @@ static int yaffs_CreateInitialDirectories(yaffs_Device *dev) dev->unlinkedDir = dev->deletedDir = NULL; dev->unlinkedDir = - yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR); + yaffs_create_fake_dir(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR); dev->deletedDir = - yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_DELETED, S_IFDIR); + yaffs_create_fake_dir(dev, YAFFS_OBJECTID_DELETED, S_IFDIR); dev->rootDir = - yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_ROOT, + yaffs_create_fake_dir(dev, YAFFS_OBJECTID_ROOT, YAFFS_ROOT_MODE | S_IFDIR); dev->lostNFoundDir = - yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND, + yaffs_create_fake_dir(dev, YAFFS_OBJECTID_LOSTNFOUND, YAFFS_LOSTNFOUND_MODE | S_IFDIR); if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) { - yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir); + yaffs_add_obj_to_dir(dev->rootDir, dev->lostNFoundDir); return YAFFS_OK; } return YAFFS_FAIL; } -int yaffs_GutsInitialise(yaffs_Device *dev) +int yaffs_guts_initialise(yaffs_Device *dev) { int init_failed = 0; unsigned x; int bits; - T(YAFFS_TRACE_TRACING, (TSTR("yaffs: yaffs_GutsInitialise()" TENDSTR))); + T(YAFFS_TRACE_TRACING, (TSTR("yaffs: yaffs_guts_initialise()" TENDSTR))); /* Check stuff that must be set */ @@ -5160,7 +5160,7 @@ int yaffs_GutsInitialise(yaffs_Device *dev) return YAFFS_FAIL; } - if (yaffs_InitialiseNAND(dev) != YAFFS_OK) { + if (yaffs_init_nand(dev) != YAFFS_OK) { T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: InitialiseNAND failed" TENDSTR))); return YAFFS_FAIL; @@ -5173,7 +5173,7 @@ int yaffs_GutsInitialise(yaffs_Device *dev) dev->nDataBytesPerChunk = dev->param.totalBytesPerChunk; /* Got the right mix of functions? */ - if (!yaffs_CheckDevFunctions(dev)) { + if (!yaffs_cehck_dev_fns(dev)) { /* Function missing */ T(YAFFS_TRACE_ALWAYS, (TSTR @@ -5183,9 +5183,9 @@ int yaffs_GutsInitialise(yaffs_Device *dev) } /* This is really a compilation check. */ - if (!yaffs_CheckStructures()) { + if (!yaffs_check_structures()) { T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs_CheckStructures failed\n" TENDSTR))); + (TSTR("yaffs_check_structures failed\n" TENDSTR))); return YAFFS_FAIL; } @@ -5289,7 +5289,7 @@ int yaffs_GutsInitialise(yaffs_Device *dev) dev->oldestDirtyBlock = 0; /* Initialise temporary buffers and caches. */ - if (!yaffs_InitialiseTempBuffers(dev)) + if (!yaffs_init_tmp_buffers(dev)) init_failed = 1; dev->srCache = NULL; @@ -5335,20 +5335,20 @@ int yaffs_GutsInitialise(yaffs_Device *dev) if (dev->param.isYaffs2) dev->param.useHeaderFileSize = 1; - if (!init_failed && !yaffs_InitialiseBlocks(dev)) + if (!init_failed && !yaffs_init_blocks(dev)) init_failed = 1; - yaffs_InitialiseTnodesAndObjects(dev); + yaffs_init_tnodes_and_objs(dev); - if (!init_failed && !yaffs_CreateInitialDirectories(dev)) + if (!init_failed && !yaffs_create_initial_dir(dev)) init_failed = 1; if (!init_failed) { /* Now scan the flash. */ if (dev->param.isYaffs2) { - if (yaffs2_CheckpointRestore(dev)) { - yaffs_CheckObjectDetailsLoaded(dev->rootDir); + if (yaffs2_checkpt_restore(dev)) { + yaffs_check_obj_details_loaded(dev->rootDir); T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: restored from checkpoint" TENDSTR))); } else { @@ -5356,9 +5356,9 @@ int yaffs_GutsInitialise(yaffs_Device *dev) /* Clean up the mess caused by an aborted checkpoint load * and scan backwards. */ - yaffs_DeinitialiseBlocks(dev); + yaffs_deinit_blocks(dev); - yaffs_DeinitialiseTnodesAndObjects(dev); + yaffs_deinit_tnodes_and_objs(dev); dev->nErasedBlocks = 0; dev->nFreeChunks = 0; @@ -5368,32 +5368,32 @@ int yaffs_GutsInitialise(yaffs_Device *dev) dev->nUnlinkedFiles = 0; dev->nBackgroundDeletions = 0; - if (!init_failed && !yaffs_InitialiseBlocks(dev)) + if (!init_failed && !yaffs_init_blocks(dev)) init_failed = 1; - yaffs_InitialiseTnodesAndObjects(dev); + yaffs_init_tnodes_and_objs(dev); - if (!init_failed && !yaffs_CreateInitialDirectories(dev)) + if (!init_failed && !yaffs_create_initial_dir(dev)) init_failed = 1; - if (!init_failed && !yaffs2_ScanBackwards(dev)) + if (!init_failed && !yaffs2_scan_backwards(dev)) init_failed = 1; } - } else if (!yaffs1_Scan(dev)) + } else if (!yaffs1_scan(dev)) init_failed = 1; - yaffs_StripDeletedObjects(dev); - yaffs_FixHangingObjects(dev); + yaffs_strip_deleted_objs(dev); + yaffs_fix_hanging_objs(dev); if(dev->param.emptyLostAndFound) - yaffs_EmptyLostAndFound(dev); + yaffs_empty_l_n_f(dev); } if (init_failed) { /* Clean up the mess */ T(YAFFS_TRACE_TRACING, - (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR))); + (TSTR("yaffs: yaffs_guts_initialise() aborted.\n" TENDSTR))); - yaffs_Deinitialise(dev); + yaffs_deinitialise(dev); return YAFFS_FAIL; } @@ -5406,26 +5406,26 @@ int yaffs_GutsInitialise(yaffs_Device *dev) dev->nRetiredBlocks = 0; - yaffs_VerifyFreeChunks(dev); - yaffs_VerifyBlocks(dev); + yaffs_verify_free_chunks(dev); + yaffs_verify_blocks(dev); /* Clean up any aborted checkpoint data */ if(!dev->isCheckpointed && dev->blocksInCheckpoint > 0) - yaffs2_InvalidateCheckpoint(dev); + yaffs2_checkpt_invalidate(dev); T(YAFFS_TRACE_TRACING, - (TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR))); + (TSTR("yaffs: yaffs_guts_initialise() done.\n" TENDSTR))); return YAFFS_OK; } -void yaffs_Deinitialise(yaffs_Device *dev) +void yaffs_deinitialise(yaffs_Device *dev) { if (dev->isMounted) { int i; - yaffs_DeinitialiseBlocks(dev); - yaffs_DeinitialiseTnodesAndObjects(dev); + yaffs_deinit_blocks(dev); + yaffs_deinit_tnodes_and_objs(dev); if (dev->param.nShortOpCaches > 0 && dev->srCache) { @@ -5451,7 +5451,7 @@ void yaffs_Deinitialise(yaffs_Device *dev) } } -int yaffs_CountFreeChunks(yaffs_Device *dev) +int yaffs_count_free_chunks(yaffs_Device *dev) { int nFree=0; int b; @@ -5478,7 +5478,7 @@ int yaffs_CountFreeChunks(yaffs_Device *dev) return nFree; } -int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) +int yaffs_get_n_free_chunks(yaffs_Device *dev) { /* This is what we report to the outside world */ @@ -5490,7 +5490,7 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) #if 1 nFree = dev->nFreeChunks; #else - nFree = yaffs_CountFreeChunks(dev); + nFree = yaffs_count_free_chunks(dev); #endif nFree += dev->nDeletedFiles; @@ -5507,7 +5507,7 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) nFree -= ((dev->param.nReservedBlocks + 1) * dev->param.nChunksPerBlock); /* Now we figure out how much to reserve for the checkpoint and report that... */ - blocksForCheckpoint = yaffs2_CalcCheckpointBlocksRequired(dev); + blocksForCheckpoint = yaffs_calc_checkpt_blocks_required(dev); nFree -= (blocksForCheckpoint * dev->param.nChunksPerBlock); @@ -5521,7 +5521,7 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) /*---------------------------------------- YAFFS test code ----------------------*/ -#define yaffs_CheckStruct(structure, syze, name) \ +#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),\ @@ -5530,15 +5530,15 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) } \ } while (0) -static int yaffs_CheckStructures(void) +static int yaffs_check_structures(void) { -/* yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */ -/* yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */ -/* yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */ -/* yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode"); */ +/* yaffs_check_struct(yaffs_Tags,8,"yaffs_Tags"); */ +/* yaffs_check_struct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */ +/* yaffs_check_struct(yaffs_Spare,16,"yaffs_Spare"); */ +/* yaffs_check_struct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode"); */ #ifndef CONFIG_YAFFS_WINCE - yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader"); + yaffs_check_struct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader"); #endif return YAFFS_OK; } diff --git a/yaffs_guts.h b/yaffs_guts.h index 4dc70a2..3a00d5b 100644 --- a/yaffs_guts.h +++ b/yaffs_guts.h @@ -827,79 +827,79 @@ typedef struct { int size; int flags; int result; -}yaffs_XAttrMod; +}yaffs_xattr_mod; /*----------------------- YAFFS Functions -----------------------*/ -int yaffs_GutsInitialise(yaffs_Device *dev); -void yaffs_Deinitialise(yaffs_Device *dev); +int yaffs_guts_initialise(yaffs_Device *dev); +void yaffs_deinitialise(yaffs_Device *dev); -int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev); +int yaffs_get_n_free_chunks(yaffs_Device *dev); -int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName, +int yaffs_rename_obj(yaffs_Object *oldDir, const YCHAR *oldName, yaffs_Object *newDir, const YCHAR *newName); int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name); -int yaffs_DeleteObject(yaffs_Object *obj); +int yaffs_del_obj(yaffs_Object *obj); -int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize); -int yaffs_GetObjectFileLength(yaffs_Object *obj); -int yaffs_GetObjectInode(yaffs_Object *obj); -unsigned yaffs_GetObjectType(yaffs_Object *obj); -int yaffs_GetObjectLinkCount(yaffs_Object *obj); +int yaffs_get_obj_name(yaffs_Object *obj, YCHAR *name, int buffSize); +int yaffs_get_obj_length(yaffs_Object *obj); +int yaffs_get_obj_inode(yaffs_Object *obj); +unsigned yaffs_get_obj_type(yaffs_Object *obj); +int yaffs_get_obj_link_count(yaffs_Object *obj); -int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr); -int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr); +int yaffs_set_attribs(yaffs_Object *obj, struct iattr *attr); +int yaffs_get_attribs(yaffs_Object *obj, struct iattr *attr); /* File operations */ -int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset, +int yaffs_file_rd(yaffs_Object *obj, __u8 *buffer, loff_t offset, int nBytes); -int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset, +int yaffs_wr_file(yaffs_Object *obj, const __u8 *buffer, loff_t offset, int nBytes, int writeThrough); -int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize); +int yaffs_resize_file(yaffs_Object *obj, loff_t newSize); -yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name, +yaffs_Object *yaffs_create_file(yaffs_Object *parent, const YCHAR *name, __u32 mode, __u32 uid, __u32 gid); -int yaffs_FlushFile(yaffs_Object *obj, int updateTime, int dataSync); +int yaffs_flush_file(yaffs_Object *obj, int updateTime, int dataSync); /* Flushing and checkpointing */ -void yaffs_FlushEntireDeviceCache(yaffs_Device *dev); +void yaffs_flush_whole_cache(yaffs_Device *dev); -int yaffs_CheckpointSave(yaffs_Device *dev); -int yaffs_CheckpointRestore(yaffs_Device *dev); +int yaffs_checkpoint_save(yaffs_Device *dev); +int yaffs_checkpoint_restore(yaffs_Device *dev); /* Directory operations */ -yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name, +yaffs_Object *yaffs_create_dir(yaffs_Object *parent, const YCHAR *name, __u32 mode, __u32 uid, __u32 gid); -yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name); +yaffs_Object *yaffs_find_by_name(yaffs_Object *theDir, const YCHAR *name); int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir, int (*fn) (yaffs_Object *)); -yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number); +yaffs_Object *yaffs_find_by_number(yaffs_Device *dev, __u32 number); /* Link operations */ yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name, yaffs_Object *equivalentObject); -yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj); +yaffs_Object *yaffs_get_equivalent_obj(yaffs_Object *obj); /* Symlink operations */ -yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name, +yaffs_Object *yaffs_create_symlink(yaffs_Object *parent, const YCHAR *name, __u32 mode, __u32 uid, __u32 gid, const YCHAR *alias); -YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj); +YCHAR *yaffs_get_symlink_alias(yaffs_Object *obj); /* Special inodes (fifos, sockets and devices) */ -yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name, +yaffs_Object *yaffs_create_special(yaffs_Object *parent, const YCHAR *name, __u32 mode, __u32 uid, __u32 gid, __u32 rdev); -int yaffs_SetXAttribute(yaffs_Object *obj, const YCHAR *name, const void * value, int size, int flags); -int yaffs_GetXAttribute(yaffs_Object *obj, const YCHAR *name, void *value, int size); -int yaffs_ListXAttributes(yaffs_Object *obj, char *buffer, int size); -int yaffs_RemoveXAttribute(yaffs_Object *obj, const YCHAR *name); +int yaffs_set_xattrib(yaffs_Object *obj, const YCHAR *name, const void * value, int size, int flags); +int yaffs_get_xattrib(yaffs_Object *obj, const YCHAR *name, void *value, int size); +int yaffs_list_xattrib(yaffs_Object *obj, char *buffer, int size); +int yaffs_remove_xattrib(yaffs_Object *obj, const YCHAR *name); /* Special directories */ yaffs_Object *yaffs_Root(yaffs_Device *dev); @@ -910,60 +910,60 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device *dev); void yfsd_WinFileTimeNow(__u32 target[2]); #endif -void yaffs_HandleDeferedFree(yaffs_Object *obj); +void yaffs_handle_defered_free(yaffs_Object *obj); -void yaffs_UpdateDirtyDirectories(yaffs_Device *dev); +void yaffs_update_dirty_dirs(yaffs_Device *dev); -int yaffs_BackgroundGarbageCollect(yaffs_Device *dev, unsigned urgency); +int yaffs_bg_gc(yaffs_Device *dev, unsigned urgency); /* Debug dump */ -int yaffs_DumpObject(yaffs_Object *obj); +int yaffs_dump_obj(yaffs_Object *obj); -void yaffs_GutsTest(yaffs_Device *dev); +void yaffs_guts_test(yaffs_Device *dev); /* A few useful functions to be used within the core files*/ -void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn); -int yaffs_CheckFF(__u8 *buffer, int nBytes); -void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi); +void yaffs_chunk_del(yaffs_Device *dev, int chunkId, int markNAND, int lyn); +int yaffs_check_ff(__u8 *buffer, int nBytes); +void yaffs_handle_chunk_error(yaffs_Device *dev, yaffs_BlockInfo *bi); -__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo); -void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo); +__u8 *yaffs_get_temp_buffer(yaffs_Device *dev, int lineNo); +void yaffs_release_temp_buffer(yaffs_Device *dev, __u8 *buffer, int lineNo); -yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev, +yaffs_Object *yaffs_find_or_create_by_number(yaffs_Device *dev, int number, yaffs_ObjectType type); -int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode, +int yaffs_put_chunk_in_file(yaffs_Object *in, int chunkInInode, int chunkInNAND, int inScan); -void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name); -void yaffs_SetObjectNameFromOH(yaffs_Object *obj, const yaffs_ObjectHeader *oh); -void yaffs_AddObjectToDirectory(yaffs_Object *directory, +void yaffs_set_obj_name(yaffs_Object *obj, const YCHAR *name); +void yaffs_set_obj_name_from_oh(yaffs_Object *obj, const yaffs_ObjectHeader *oh); +void yaffs_add_obj_to_dir(yaffs_Object *directory, yaffs_Object *obj); -YCHAR *yaffs_CloneString(const YCHAR *str); -void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList); -void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo); -int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, +YCHAR *yaffs_clone_str(const YCHAR *str); +void yaffs_link_fixup(yaffs_Device *dev, yaffs_Object *hardList); +void yaffs_block_became_dirty(yaffs_Device *dev, int blockNo); +int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force, int isShrink, int shadows, - yaffs_XAttrMod *xop); -void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId, + yaffs_xattr_mod *xop); +void yaffs_handle_shadowed_obj(yaffs_Device *dev, int objId, int backwardScanning); -int yaffs_CheckSpaceForAllocation(yaffs_Device *dev, int nChunks); -yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev); -yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, +int yaffs_check_alloc_available(yaffs_Device *dev, int nChunks); +yaffs_Tnode *yaffs_get_tnode(yaffs_Device *dev); +yaffs_Tnode *yaffs_add_find_tnode_0(yaffs_Device *dev, yaffs_FileStructure *fStruct, __u32 chunkId, yaffs_Tnode *passedTn); -int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, +int yaffs_do_file_wr(yaffs_Object *in, const __u8 *buffer, loff_t offset, int nBytes, int writeThrough); -void yaffs_ResizeDown( yaffs_Object *obj, loff_t newSize); -void yaffs_SkipRestOfBlock(yaffs_Device *dev); +void yaffs_resize_file_down( yaffs_Object *obj, loff_t newSize); +void yaffs_skip_rest_of_block(yaffs_Device *dev); -int yaffs_CountFreeChunks(yaffs_Device *dev); +int yaffs_count_free_chunks(yaffs_Device *dev); -yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev, +yaffs_Tnode *yaffs_find_tnode_0(yaffs_Device *dev, yaffs_FileStructure *fStruct, __u32 chunkId); -__u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos); +__u32 yaffs_get_group_base(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos); #endif diff --git a/yaffs_linux.h b/yaffs_linux.h index ce059fd..5e08c07 100644 --- a/yaffs_linux.h +++ b/yaffs_linux.h @@ -36,8 +36,8 @@ struct yaffs_LinuxContext { unsigned mount_id; }; -#define yaffs_DeviceToLC(dev) ((struct yaffs_LinuxContext *)((dev)->osContext)) -#define yaffs_DeviceToMtd(dev) ((struct mtd_info *)((dev)->driverContext)) +#define yaffs_dev_to_lc(dev) ((struct yaffs_LinuxContext *)((dev)->osContext)) +#define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driverContext)) #endif diff --git a/yaffs_linux_allocator.c b/yaffs_linux_allocator.c index d4205fa..3fdcc18 100644 --- a/yaffs_linux_allocator.c +++ b/yaffs_linux_allocator.c @@ -40,7 +40,7 @@ typedef struct yaffs_AllocatorStruct yaffs_Allocator; int mount_id; -void yaffs_DeinitialiseRawTnodesAndObjects(yaffs_Device *dev) +void yaffs_deinit_raw_tnodes_and_objs(yaffs_Device *dev) { yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator; @@ -100,10 +100,10 @@ static void (*fake_ctor_list[10]) (void *) = { fake_ctor9, }; -void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev) +void yaffs_init_raw_tnodes_and_objs(yaffs_Device *dev) { yaffs_Allocator *allocator; - unsigned mount_id = yaffs_DeviceToLC(dev)->mount_id; + unsigned mount_id = yaffs_dev_to_lc(dev)->mount_id; T(YAFFS_TRACE_ALLOCATE,(TSTR("Initialising yaffs allocator\n"))); @@ -163,7 +163,7 @@ void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev) } -yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev) +yaffs_Tnode *yaffs_alloc_raw_tnode(yaffs_Device *dev) { yaffs_Allocator *allocator = dev->allocator; if(!allocator || !allocator->tnode_cache){ @@ -173,13 +173,13 @@ yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev) return kmem_cache_alloc(allocator->tnode_cache, GFP_NOFS); } -void yaffs_FreeRawTnode(yaffs_Device *dev, yaffs_Tnode *tn) +void yaffs_free_raw_tnode(yaffs_Device *dev, yaffs_Tnode *tn) { yaffs_Allocator *allocator = dev->allocator; kmem_cache_free(allocator->tnode_cache,tn); } -yaffs_Object *yaffs_AllocateRawObject(yaffs_Device *dev) +yaffs_Object *yaffs_alloc_raw_obj(yaffs_Device *dev) { yaffs_Allocator *allocator = dev->allocator; if(!allocator){ @@ -193,7 +193,7 @@ yaffs_Object *yaffs_AllocateRawObject(yaffs_Device *dev) return kmem_cache_alloc(allocator->object_cache, GFP_NOFS); } -void yaffs_FreeRawObject(yaffs_Device *dev, yaffs_Object *obj) +void yaffs_free_raw_obj(yaffs_Device *dev, yaffs_Object *obj) { yaffs_Allocator *allocator = dev->allocator; kmem_cache_free(allocator->object_cache,obj); diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c index e073a5e..48d9058 100644 --- a/yaffs_mtdif.c +++ b/yaffs_mtdif.c @@ -25,7 +25,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber) { - struct mtd_info *mtd = yaffs_DeviceToMtd(dev); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); __u32 addr = ((loff_t) blockNumber) * dev->param.totalBytesPerChunk * dev->param.nChunksPerBlock; diff --git a/yaffs_mtdif1.c b/yaffs_mtdif1.c index b14a254..70876bc 100644 --- a/yaffs_mtdif1.c +++ b/yaffs_mtdif1.c @@ -27,7 +27,7 @@ #include "yaffs_trace.h" #include "yaffs_guts.h" #include "yaffs_packedtags1.h" -#include "yaffs_tagscompat.h" /* for yaffs_CalcTagsECC */ +#include "yaffs_tagscompat.h" /* for yaffs_calc_tags_ecc */ #include "yaffs_linux.h" #include "linux/kernel.h" @@ -91,7 +91,7 @@ static struct nand_ecclayout nand_oob_16 = { int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags) { - struct mtd_info *mtd = yaffs_DeviceToMtd(dev); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); int chunkBytes = dev->nDataBytesPerChunk; loff_t addr = ((loff_t)chunkInNAND) * chunkBytes; struct mtd_oob_ops ops; @@ -103,7 +103,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, compile_time_assertion(sizeof(yaffs_Tags) == 8); yaffs_PackTags1(&pt1, etags); - yaffs_CalcTagsECC((yaffs_Tags *)&pt1); + yaffs_calc_tags_ecc((yaffs_Tags *)&pt1); /* When deleting a chunk, the upper layer provides only skeletal * etags, one with chunkDeleted set. However, we need to update the @@ -169,7 +169,7 @@ static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval) int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags) { - struct mtd_info *mtd = yaffs_DeviceToMtd(dev); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); int chunkBytes = dev->nDataBytesPerChunk; loff_t addr = ((loff_t)chunkInNAND) * chunkBytes; int eccres = YAFFS_ECC_RESULT_NO_ERROR; @@ -224,7 +224,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, /* Check for a blank/erased chunk. */ - if (yaffs_CheckFF((__u8 *)&pt1, 8)) { + if (yaffs_check_ff((__u8 *)&pt1, 8)) { /* when blank, upper layers want eccResult to be <= NO_ERROR */ return rettags(etags, YAFFS_ECC_RESULT_NO_ERROR, YAFFS_OK); } @@ -237,12 +237,12 @@ int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, deleted = !pt1.deleted; pt1.deleted = 1; #else - deleted = (yaffs_CountBits(((__u8 *)&pt1)[8]) < 7); + deleted = (yaffs_count_bits(((__u8 *)&pt1)[8]) < 7); #endif /* Check the packed tags mini-ECC and correct if necessary/possible. */ - retval = yaffs_CheckECCOnTags((yaffs_Tags *)&pt1); + retval = yaffs_check_tags_ecc((yaffs_Tags *)&pt1); switch (retval) { case 0: /* no tags error, use MTD result */ @@ -260,10 +260,10 @@ int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, } /* Unpack the tags to extended form and set ECC result. - * [set shouldBeFF just to keep yaffs_UnpackTags1 happy] + * [set shouldBeFF just to keep yaffs_unpack_tags1 happy] */ pt1.shouldBeFF = 0xFFFFFFFF; - yaffs_UnpackTags1(etags, &pt1); + yaffs_unpack_tags1(etags, &pt1); etags->eccResult = eccres; /* Set deleted state */ @@ -280,7 +280,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, */ int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo) { - struct mtd_info *mtd = yaffs_DeviceToMtd(dev); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); int blocksize = dev->param.nChunksPerBlock * dev->nDataBytesPerChunk; int retval; @@ -321,7 +321,7 @@ static int nandmtd1_TestPrerequists(struct mtd_info *mtd) int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *pState, __u32 *pSequenceNumber) { - struct mtd_info *mtd = yaffs_DeviceToMtd(dev); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); int chunkNo = blockNo * dev->param.nChunksPerBlock; loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk; yaffs_ExtendedTags etags; diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c index 2b0a601..5f3e34c 100644 --- a/yaffs_mtdif2.c +++ b/yaffs_mtdif2.c @@ -34,7 +34,7 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *tags) { - struct mtd_info *mtd = yaffs_DeviceToMtd(dev); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); #if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17)) struct mtd_oob_ops ops; #else @@ -100,7 +100,7 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND, int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags) { - struct mtd_info *mtd = yaffs_DeviceToMtd(dev); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); #if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17)) struct mtd_oob_ops ops; #endif @@ -124,7 +124,7 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, if (!data) { localData = 1; - data = yaffs_GetTempBuffer(dev, __LINE__); + data = yaffs_get_temp_buffer(dev, __LINE__); } @@ -141,7 +141,7 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, ops.len = data ? dev->nDataBytesPerChunk : packed_tags_size; ops.ooboffs = 0; ops.datbuf = data; - ops.oobbuf = yaffs_DeviceToLC(dev)->spareBuffer; + ops.oobbuf = yaffs_dev_to_lc(dev)->spareBuffer; retval = mtd->read_oob(mtd, addr, &ops); } #else @@ -167,17 +167,17 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, if (tags) { yaffs_PackedTags2TagsPart *pt2tp; pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk]; - yaffs_UnpackTags2TagsPart(tags, pt2tp); + yaffs_unpack_tags2tags_part(tags, pt2tp); } } else { if (tags) { - memcpy(packed_tags_ptr, yaffs_DeviceToLC(dev)->spareBuffer, packed_tags_size); - yaffs_UnpackTags2(tags, &pt, !dev->param.noTagsECC); + memcpy(packed_tags_ptr, yaffs_dev_to_lc(dev)->spareBuffer, packed_tags_size); + yaffs_unpack_tags2(tags, &pt, !dev->param.noTagsECC); } } if (localData) - yaffs_ReleaseTempBuffer(dev, data, __LINE__); + yaffs_release_temp_buffer(dev, data, __LINE__); if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) { tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; @@ -195,7 +195,7 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo) { - struct mtd_info *mtd = yaffs_DeviceToMtd(dev); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); int retval; T(YAFFS_TRACE_MTD, (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), blockNo)); @@ -215,7 +215,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo) int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, __u32 *sequenceNumber) { - struct mtd_info *mtd = yaffs_DeviceToMtd(dev); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); int retval; T(YAFFS_TRACE_MTD, diff --git a/yaffs_nand.c b/yaffs_nand.c index 6964ad1..bd1f058 100644 --- a/yaffs_nand.c +++ b/yaffs_nand.c @@ -17,7 +17,7 @@ #include "yaffs_getblockinfo.h" -int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, +int yaffs_rd_chunk_tags_nand(yaffs_Device *dev, int chunkInNAND, __u8 *buffer, yaffs_ExtendedTags *tags) { @@ -36,7 +36,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, result = dev->param.readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer, tags); else - result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev, + result = yaffs_tags_compat_rd(dev, realignedChunkInNAND, buffer, tags); @@ -44,14 +44,14 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) { yaffs_BlockInfo *bi; - bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->param.nChunksPerBlock); - yaffs_HandleChunkError(dev, bi); + bi = yaffs_get_block_info(dev, chunkInNAND/dev->param.nChunksPerBlock); + yaffs_handle_chunk_error(dev, bi); } return result; } -int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev, +int yaffs_wr_chunk_tags_nand(yaffs_Device *dev, int chunkInNAND, const __u8 *buffer, yaffs_ExtendedTags *tags) @@ -65,7 +65,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev, if (tags) { tags->sequenceNumber = dev->sequenceNumber; tags->chunkUsed = 1; - if (!yaffs_ValidateTags(tags)) { + if (!yaffs_validate_tags(tags)) { T(YAFFS_TRACE_ERROR, (TSTR("Writing uninitialised tags" TENDSTR))); YBUG(); @@ -82,13 +82,13 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev, return dev->param.writeChunkWithTagsToNAND(dev, chunkInNAND, buffer, tags); else - return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev, + return yaffs_tags_compat_wr(dev, chunkInNAND, buffer, tags); } -int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo) +int yaffs_mark_bad(yaffs_Device *dev, int blockNo) { blockNo -= dev->blockOffset; @@ -96,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo) if (dev->param.markNANDBlockBad) return dev->param.markNANDBlockBad(dev, blockNo); else - return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo); + return yaffs_tags_compat_mark_bad(dev, blockNo); } -int yaffs_QueryInitialBlockState(yaffs_Device *dev, +int yaffs_query_init_block_state(yaffs_Device *dev, int blockNo, yaffs_BlockState *state, __u32 *sequenceNumber) @@ -109,13 +109,13 @@ int yaffs_QueryInitialBlockState(yaffs_Device *dev, if (dev->param.queryNANDBlock) return dev->param.queryNANDBlock(dev, blockNo, state, sequenceNumber); else - return yaffs_TagsCompatabilityQueryNANDBlock(dev, blockNo, + return yaffs_tags_compat_query_block(dev, blockNo, state, sequenceNumber); } -int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev, +int yaffs_erase_block(struct yaffs_DeviceStruct *dev, int blockInNAND) { int result; @@ -129,7 +129,7 @@ int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev, return result; } -int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev) +int yaffs_init_nand(struct yaffs_DeviceStruct *dev) { if(dev->param.initialiseNAND) return dev->param.initialiseNAND(dev); diff --git a/yaffs_nand.h b/yaffs_nand.h index 62a4665..520c70a 100644 --- a/yaffs_nand.h +++ b/yaffs_nand.h @@ -19,26 +19,26 @@ -int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, +int yaffs_rd_chunk_tags_nand(yaffs_Device *dev, int chunkInNAND, __u8 *buffer, yaffs_ExtendedTags *tags); -int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev, +int yaffs_wr_chunk_tags_nand(yaffs_Device *dev, int chunkInNAND, const __u8 *buffer, yaffs_ExtendedTags *tags); -int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo); +int yaffs_mark_bad(yaffs_Device *dev, int blockNo); -int yaffs_QueryInitialBlockState(yaffs_Device *dev, +int yaffs_query_init_block_state(yaffs_Device *dev, int blockNo, yaffs_BlockState *state, unsigned *sequenceNumber); -int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev, +int yaffs_erase_block(struct yaffs_DeviceStruct *dev, int blockInNAND); -int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev); +int yaffs_init_nand(struct yaffs_DeviceStruct *dev); #endif diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c index b2160c0..db136b9 100644 --- a/yaffs_packedtags1.c +++ b/yaffs_packedtags1.c @@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t) } -void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt) +void yaffs_unpack_tags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt) { static const __u8 allFF[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, diff --git a/yaffs_packedtags1.h b/yaffs_packedtags1.h index b9cf1a8..3c741b8 100644 --- a/yaffs_packedtags1.h +++ b/yaffs_packedtags1.h @@ -33,5 +33,5 @@ typedef struct { } yaffs_PackedTags1; void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t); -void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt); +void yaffs_unpack_tags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt); #endif diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c index f8ae94c..f8030c7 100644 --- a/yaffs_packedtags2.c +++ b/yaffs_packedtags2.c @@ -102,19 +102,19 @@ void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t, int tag yaffs_PackTags2TagsPart(&pt->t, t); if(tagsECC) - yaffs_ECCCalculateOther((unsigned char *)&pt->t, + yaffs_ecc_calc_other((unsigned char *)&pt->t, sizeof(yaffs_PackedTags2TagsPart), &pt->ecc); } -void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, +void yaffs_unpack_tags2tags_part(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *ptt) { memset(t, 0, sizeof(yaffs_ExtendedTags)); - yaffs_InitialiseTags(t); + yaffs_init_tags(t); if (ptt->sequenceNumber != 0xFFFFFFFF) { t->blockBad = 0; @@ -156,7 +156,7 @@ void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, } -void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt, int tagsECC) +void yaffs_unpack_tags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt, int tagsECC) { yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR; @@ -167,10 +167,10 @@ void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt, int tagsECC yaffs_ECCOther ecc; int result; - yaffs_ECCCalculateOther((unsigned char *)&pt->t, + yaffs_ecc_calc_other((unsigned char *)&pt->t, sizeof(yaffs_PackedTags2TagsPart), &ecc); - result = yaffs_ECCCorrectOther((unsigned char *)&pt->t, + result = yaffs_ecc_correct_other((unsigned char *)&pt->t, sizeof(yaffs_PackedTags2TagsPart), &pt->ecc, &ecc); switch (result) { @@ -188,7 +188,7 @@ void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt, int tagsECC } } - yaffs_UnpackTags2TagsPart(t, &pt->t); + yaffs_unpack_tags2tags_part(t, &pt->t); t->eccResult = eccResult; diff --git a/yaffs_packedtags2.h b/yaffs_packedtags2.h index c132a98..a27fdb1 100644 --- a/yaffs_packedtags2.h +++ b/yaffs_packedtags2.h @@ -35,9 +35,9 @@ typedef struct { /* Full packed tags with ECC, used for oob tags */ void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t, int tagsECC); -void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt, int tagsECC); +void yaffs_unpack_tags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt, int tagsECC); /* Only the tags part (no ECC for use with inband tags */ void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t); -void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt); +void yaffs_unpack_tags2tags_part(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt); #endif diff --git a/yaffs_tagscompat.c b/yaffs_tagscompat.c index e9ac51d..71cac82 100644 --- a/yaffs_tagscompat.c +++ b/yaffs_tagscompat.c @@ -17,18 +17,18 @@ #include "yaffs_getblockinfo.h" #include "yaffs_trace.h" -static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND); +static void yaffs_handle_rd_data_error(yaffs_Device *dev, int chunkInNAND); #ifdef NOTYET -static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND); -static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND, +static void yaffs_check_written_block(yaffs_Device *dev, int chunkInNAND); +static void yaffs_handle_chunk_wr_ok(yaffs_Device *dev, int chunkInNAND, const __u8 *data, const yaffs_Spare *spare); -static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND, +static void yaffs_handle_chunk_update(yaffs_Device *dev, int chunkInNAND, const yaffs_Spare *spare); -static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND); +static void yaffs_handle_chunk_wr_error(yaffs_Device *dev, int chunkInNAND); #endif -static const char yaffs_countBitsTable[256] = { +static const char yaffs_count_bits_table[256] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, @@ -47,22 +47,22 @@ static const char yaffs_countBitsTable[256] = { 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8 }; -int yaffs_CountBits(__u8 x) +int yaffs_count_bits(__u8 x) { int retVal; - retVal = yaffs_countBitsTable[x]; + retVal = yaffs_count_bits_table[x]; return retVal; } /********** Tags ECC calculations *********/ -void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare) +void yaffs_calc_ecc(const __u8 *data, yaffs_Spare *spare) { - yaffs_ECCCalculate(data, spare->ecc1); - yaffs_ECCCalculate(&data[256], spare->ecc2); + yaffs_ecc_cacl(data, spare->ecc1); + yaffs_ecc_cacl(&data[256], spare->ecc2); } -void yaffs_CalcTagsECC(yaffs_Tags *tags) +void yaffs_calc_tags_ecc(yaffs_Tags *tags) { /* Calculate an ecc */ @@ -85,11 +85,11 @@ void yaffs_CalcTagsECC(yaffs_Tags *tags) } -int yaffs_CheckECCOnTags(yaffs_Tags *tags) +int yaffs_check_tags_ecc(yaffs_Tags *tags) { unsigned ecc = tags->ecc; - yaffs_CalcTagsECC(tags); + yaffs_calc_tags_ecc(tags); ecc ^= tags->ecc; @@ -102,7 +102,7 @@ int yaffs_CheckECCOnTags(yaffs_Tags *tags) b[ecc / 8] ^= (1 << (ecc & 7)); /* Now recvalc the ecc */ - yaffs_CalcTagsECC(tags); + yaffs_calc_tags_ecc(tags); return 1; /* recovered error */ } else if (ecc) { @@ -116,12 +116,12 @@ int yaffs_CheckECCOnTags(yaffs_Tags *tags) /********** Tags **********/ -static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, +static void yaffs_load_tags_to_spare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr) { yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr; - yaffs_CalcTagsECC(tagsPtr); + yaffs_calc_tags_ecc(tagsPtr); sparePtr->tagByte0 = tu->asBytes[0]; sparePtr->tagByte1 = tu->asBytes[1]; @@ -133,7 +133,7 @@ static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, sparePtr->tagByte7 = tu->asBytes[7]; } -static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr, +static void yaffs_get_tags_from_spare(yaffs_Device *dev, yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr) { yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr; @@ -148,19 +148,19 @@ static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr, tu->asBytes[6] = sparePtr->tagByte6; tu->asBytes[7] = sparePtr->tagByte7; - result = yaffs_CheckECCOnTags(tagsPtr); + result = yaffs_check_tags_ecc(tagsPtr); if (result > 0) dev->tagsEccFixed++; else if (result < 0) dev->tagsEccUnfixed++; } -static void yaffs_SpareInitialise(yaffs_Spare *spare) +static void yaffs_spare_init(yaffs_Spare *spare) { memset(spare, 0xFF, sizeof(yaffs_Spare)); } -static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev, +static int yaffs_wr_nand(struct yaffs_DeviceStruct *dev, int chunkInNAND, const __u8 *data, yaffs_Spare *spare) { @@ -174,7 +174,7 @@ static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev, return dev->param.writeChunkToNAND(dev, chunkInNAND, data, spare); } -static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, +static int yaffs_rd_chunk_nand(struct yaffs_DeviceStruct *dev, int chunkInNAND, __u8 *data, yaffs_Spare *spare, @@ -198,12 +198,12 @@ static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, int eccResult1, eccResult2; __u8 calcEcc[3]; - yaffs_ECCCalculate(data, calcEcc); + yaffs_ecc_cacl(data, calcEcc); eccResult1 = - yaffs_ECCCorrect(data, spare->ecc1, calcEcc); - yaffs_ECCCalculate(&data[256], calcEcc); + yaffs_ecc_correct(data, spare->ecc1, calcEcc); + yaffs_ecc_cacl(&data[256], calcEcc); eccResult2 = - yaffs_ECCCorrect(&data[256], spare->ecc2, calcEcc); + yaffs_ecc_correct(&data[256], spare->ecc2, calcEcc); if (eccResult1 > 0) { T(YAFFS_TRACE_ERROR, @@ -235,7 +235,7 @@ static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, if (eccResult1 || eccResult2) { /* We had a data problem on this page */ - yaffs_HandleReadDataError(dev, chunkInNAND); + yaffs_handle_rd_data_error(dev, chunkInNAND); } if (eccResult1 < 0 || eccResult2 < 0) @@ -282,7 +282,7 @@ static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, if (nspare.eccres1 || nspare.eccres2) { /* We had a data problem on this page */ - yaffs_HandleReadDataError(dev, chunkInNAND); + yaffs_handle_rd_data_error(dev, chunkInNAND); } if (nspare.eccres1 < 0 || nspare.eccres2 < 0) @@ -298,7 +298,7 @@ static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, } #ifdef NOTYET -static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, +static int yaffs_check_chunk_erased(struct yaffs_DeviceStruct *dev, int chunkInNAND) { static int init; @@ -329,12 +329,12 @@ static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, * Functions for robustisizing */ -static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND) +static void yaffs_handle_rd_data_error(yaffs_Device *dev, int chunkInNAND) { int blockInNAND = chunkInNAND / dev->param.nChunksPerBlock; /* Mark the block for retirement */ - yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1; + yaffs_get_block_info(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1; T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND)); @@ -346,32 +346,32 @@ static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND) } #ifdef NOTYET -static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND) +static void yaffs_check_written_block(yaffs_Device *dev, int chunkInNAND) { } -static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND, +static void yaffs_handle_chunk_wr_ok(yaffs_Device *dev, int chunkInNAND, const __u8 *data, const yaffs_Spare *spare) { } -static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND, +static void yaffs_handle_chunk_update(yaffs_Device *dev, int chunkInNAND, const yaffs_Spare *spare) { } -static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND) +static void yaffs_handle_chunk_wr_error(yaffs_Device *dev, int chunkInNAND) { int blockInNAND = chunkInNAND / dev->param.nChunksPerBlock; /* Mark the block for retirement */ - yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1; + yaffs_get_block_info(dev, blockInNAND)->needsRetiring = 1; /* Delete the chunk */ - yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__); + yaffs_chunk_del(dev, chunkInNAND, 1, __LINE__); } -static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1, +static int yaffs_verify_cmp(const __u8 *d0, const __u8 *d1, const yaffs_Spare *s0, const yaffs_Spare *s1) { @@ -396,7 +396,7 @@ static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1, } #endif /* NOTYET */ -int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev, +int yaffs_tags_compat_wr(yaffs_Device *dev, int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *eTags) @@ -404,7 +404,7 @@ int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev, yaffs_Spare spare; yaffs_Tags tags; - yaffs_SpareInitialise(&spare); + yaffs_spare_init(&spare); if (eTags->chunkDeleted) spare.pageStatus = 0; @@ -423,16 +423,16 @@ int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev, tags.serialNumber = eTags->serialNumber; if (!dev->param.useNANDECC && data) - yaffs_CalcECC(data, &spare); + yaffs_calc_ecc(data, &spare); - yaffs_LoadTagsIntoSpare(&spare, &tags); + yaffs_load_tags_to_spare(&spare, &tags); } - return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare); + return yaffs_wr_nand(dev, chunkInNAND, data, &spare); } -int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev, +int yaffs_tags_compat_rd(yaffs_Device *dev, int chunkInNAND, __u8 *data, yaffs_ExtendedTags *eTags) @@ -450,13 +450,13 @@ int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev, init = 1; } - if (yaffs_ReadChunkFromNAND + if (yaffs_rd_chunk_nand (dev, chunkInNAND, data, &spare, &eccResult, 1)) { /* eTags may be NULL */ if (eTags) { int deleted = - (yaffs_CountBits(spare.pageStatus) < 7) ? 1 : 0; + (yaffs_count_bits(spare.pageStatus) < 7) ? 1 : 0; eTags->chunkDeleted = deleted; eTags->eccResult = eccResult; @@ -467,7 +467,7 @@ int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev, 0) ? 1 : 0; if (eTags->chunkUsed) { - yaffs_GetTagsFromSpare(dev, &spare, &tags); + yaffs_get_tags_from_spare(dev, &spare, &tags); eTags->objectId = tags.objectId; eTags->chunkId = tags.chunkId; @@ -486,7 +486,7 @@ int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev, } } -int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev, +int yaffs_tags_compat_mark_bad(struct yaffs_DeviceStruct *dev, int blockInNAND) { @@ -496,16 +496,16 @@ int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev, spare.blockStatus = 'Y'; - yaffs_WriteChunkToNAND(dev, blockInNAND * dev->param.nChunksPerBlock, NULL, + yaffs_wr_nand(dev, blockInNAND * dev->param.nChunksPerBlock, NULL, &spare); - yaffs_WriteChunkToNAND(dev, blockInNAND * dev->param.nChunksPerBlock + 1, + yaffs_wr_nand(dev, blockInNAND * dev->param.nChunksPerBlock + 1, NULL, &spare); return YAFFS_OK; } -int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev, +int yaffs_tags_compat_query_block(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, __u32 *sequenceNumber) @@ -523,12 +523,12 @@ int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev, *sequenceNumber = 0; - yaffs_ReadChunkFromNAND(dev, blockNo * dev->param.nChunksPerBlock, NULL, + yaffs_rd_chunk_nand(dev, blockNo * dev->param.nChunksPerBlock, NULL, &spare0, &dummy, 1); - yaffs_ReadChunkFromNAND(dev, blockNo * dev->param.nChunksPerBlock + 1, NULL, + yaffs_rd_chunk_nand(dev, blockNo * dev->param.nChunksPerBlock + 1, NULL, &spare1, &dummy, 1); - if (yaffs_CountBits(spare0.blockStatus & spare1.blockStatus) < 7) + if (yaffs_count_bits(spare0.blockStatus & spare1.blockStatus) < 7) *state = YAFFS_BLOCK_STATE_DEAD; else if (memcmp(&spareFF, &spare0, sizeof(spareFF)) == 0) *state = YAFFS_BLOCK_STATE_EMPTY; diff --git a/yaffs_tagscompat.h b/yaffs_tagscompat.h index 8c663db..300fb67 100644 --- a/yaffs_tagscompat.h +++ b/yaffs_tagscompat.h @@ -17,23 +17,23 @@ #define __YAFFS_TAGSCOMPAT_H__ #include "yaffs_guts.h" -int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev, +int yaffs_tags_compat_wr(yaffs_Device *dev, int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *tags); -int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev, +int yaffs_tags_compat_rd(yaffs_Device *dev, int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags); -int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev, +int yaffs_tags_compat_mark_bad(struct yaffs_DeviceStruct *dev, int blockNo); -int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev, +int yaffs_tags_compat_query_block(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, __u32 *sequenceNumber); -void yaffs_CalcTagsECC(yaffs_Tags *tags); -int yaffs_CheckECCOnTags(yaffs_Tags *tags); -int yaffs_CountBits(__u8 byte); +void yaffs_calc_tags_ecc(yaffs_Tags *tags); +int yaffs_check_tags_ecc(yaffs_Tags *tags); +int yaffs_count_bits(__u8 byte); #endif diff --git a/yaffs_tagsvalidity.c b/yaffs_tagsvalidity.c index 93ad08c..43ce44e 100644 --- a/yaffs_tagsvalidity.c +++ b/yaffs_tagsvalidity.c @@ -13,14 +13,14 @@ #include "yaffs_tagsvalidity.h" -void yaffs_InitialiseTags(yaffs_ExtendedTags *tags) +void yaffs_init_tags(yaffs_ExtendedTags *tags) { memset(tags, 0, sizeof(yaffs_ExtendedTags)); tags->validMarker0 = 0xAAAAAAAA; tags->validMarker1 = 0x55555555; } -int yaffs_ValidateTags(yaffs_ExtendedTags *tags) +int yaffs_validate_tags(yaffs_ExtendedTags *tags) { return (tags->validMarker0 == 0xAAAAAAAA && tags->validMarker1 == 0x55555555); diff --git a/yaffs_tagsvalidity.h b/yaffs_tagsvalidity.h index 60a1aea..7f0b449 100644 --- a/yaffs_tagsvalidity.h +++ b/yaffs_tagsvalidity.h @@ -19,6 +19,6 @@ #include "yaffs_guts.h" -void yaffs_InitialiseTags(yaffs_ExtendedTags *tags); -int yaffs_ValidateTags(yaffs_ExtendedTags *tags); +void yaffs_init_tags(yaffs_ExtendedTags *tags); +int yaffs_validate_tags(yaffs_ExtendedTags *tags); #endif diff --git a/yaffs_trace.h b/yaffs_trace.h index 8b848ed..9fe7214 100644 --- a/yaffs_trace.h +++ b/yaffs_trace.h @@ -17,7 +17,7 @@ #ifndef __YTRACE_H__ #define __YTRACE_H__ -extern unsigned int yaffs_traceMask; +extern unsigned int yaffs_trace_mask; extern unsigned int yaffs_wr_attempts; /* @@ -55,6 +55,6 @@ extern unsigned int yaffs_wr_attempts; #define YAFFS_TRACE_ALWAYS 0xF0000000 -#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0) +#define T(mask, p) do { if ((mask) & (yaffs_trace_mask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0) #endif diff --git a/yaffs_verify.c b/yaffs_verify.c index a600aa6..b231799 100644 --- a/yaffs_verify.c +++ b/yaffs_verify.c @@ -18,22 +18,22 @@ #include "yaffs_getblockinfo.h" #include "yaffs_nand.h" -int yaffs_SkipVerification(yaffs_Device *dev) +int yaffs_skip_verification(yaffs_Device *dev) { dev=dev; - return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL)); + return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL)); } -static int yaffs_SkipFullVerification(yaffs_Device *dev) +static int yaffs_skip_full_verification(yaffs_Device *dev) { dev=dev; - return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_FULL)); + return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL)); } -static int yaffs_SkipNANDVerification(yaffs_Device *dev) +static int yaffs_skip_nand_verification(yaffs_Device *dev) { dev=dev; - return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND)); + return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND)); } @@ -51,12 +51,12 @@ static const char *blockStateName[] = { }; -void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n) +void yaffs_verify_blk(yaffs_Device *dev, yaffs_BlockInfo *bi, int n) { int actuallyUsed; int inUse; - if (yaffs_SkipVerification(dev)) + if (yaffs_skip_verification(dev)) return; /* Report illegal runtime states */ @@ -83,7 +83,7 @@ void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n) /* Check chunk bitmap legal */ - inUse = yaffs_CountChunkBits(dev, n); + inUse = yaffs_count_chunk_bits(dev, n); if (inUse != bi->pagesInUse) T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR), n, bi->pagesInUse, inUse)); @@ -92,9 +92,9 @@ void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n) -void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n) +void yaffs_verify_collected_blk(yaffs_Device *dev, yaffs_BlockInfo *bi, int n) { - yaffs_VerifyBlock(dev, bi, n); + yaffs_verify_blk(dev, bi, n); /* After collection the block should be in the erased state */ @@ -105,20 +105,20 @@ void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n) } } -void yaffs_VerifyBlocks(yaffs_Device *dev) +void yaffs_verify_blocks(yaffs_Device *dev) { int i; int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES]; int nIllegalBlockStates = 0; - if (yaffs_SkipVerification(dev)) + if (yaffs_skip_verification(dev)) return; memset(nBlocksPerState, 0, sizeof(nBlocksPerState)); for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) { - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i); - yaffs_VerifyBlock(dev, bi, i); + yaffs_BlockInfo *bi = yaffs_get_block_info(dev, i); + yaffs_verify_blk(dev, bi, i); if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES) nBlocksPerState[bi->blockState]++; @@ -161,9 +161,9 @@ void yaffs_VerifyBlocks(yaffs_Device *dev) * Verify the object header. oh must be valid, but obj and tags may be NULL in which * case those tests will not be performed. */ -void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck) +void yaffs_verify_oh(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck) { - if (obj && yaffs_SkipVerification(obj->myDev)) + if (obj && yaffs_skip_verification(obj->myDev)) return; if (!(tags && obj && oh)) { @@ -218,7 +218,7 @@ void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_E #if 0 /* Not being used, but don't want to throw away yet */ -int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn, +int yaffs_verify_tnode_worker(yaffs_Object *obj, yaffs_Tnode *tn, __u32 level, int chunkOffset) { int i; @@ -230,7 +230,7 @@ int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn, for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) { if (tn->internal[i]) { - ok = yaffs_VerifyTnodeWorker(obj, + ok = yaffs_verify_tnode_worker(obj, tn->internal[i], level - 1, (chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i); @@ -243,11 +243,11 @@ int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn, chunkOffset <<= YAFFS_TNODES_LEVEL0_BITS; for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) { - __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i); + __u32 theChunk = yaffs_get_group_base(dev, tn, i); if (theChunk > 0) { /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */ - yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags); + yaffs_rd_chunk_tags_nand(dev, theChunk, NULL, &tags); if (tags.objectId != objectId || tags.chunkId != chunkOffset) { T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR), objectId, chunkOffset, theChunk, @@ -265,7 +265,7 @@ int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn, #endif -void yaffs_VerifyFile(yaffs_Object *obj) +void yaffs_verify_file(yaffs_Object *obj) { int requiredTallness; int actualTallness; @@ -280,7 +280,7 @@ void yaffs_VerifyFile(yaffs_Object *obj) if (!obj) return; - if (yaffs_SkipVerification(obj->myDev)) + if (yaffs_skip_verification(obj->myDev)) return; dev = obj->myDev; @@ -302,17 +302,17 @@ void yaffs_VerifyFile(yaffs_Object *obj) * checking the tags for every chunk match. */ - if (yaffs_SkipNANDVerification(dev)) + if (yaffs_skip_nand_verification(dev)) return; for (i = 1; i <= lastChunk; i++) { - tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i); + tn = yaffs_find_tnode_0(dev, &obj->variant.fileVariant, i); if (tn) { - __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i); + __u32 theChunk = yaffs_get_group_base(dev, tn, i); if (theChunk > 0) { /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */ - yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags); + yaffs_rd_chunk_tags_nand(dev, theChunk, NULL, &tags); if (tags.objectId != objectId || tags.chunkId != i) { T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR), objectId, i, theChunk, @@ -324,29 +324,29 @@ void yaffs_VerifyFile(yaffs_Object *obj) } -void yaffs_VerifyHardLink(yaffs_Object *obj) +void yaffs_verify_link(yaffs_Object *obj) { - if (obj && yaffs_SkipVerification(obj->myDev)) + if (obj && yaffs_skip_verification(obj->myDev)) return; /* Verify sane equivalent object */ } -void yaffs_VerifySymlink(yaffs_Object *obj) +void yaffs_verify_symlink(yaffs_Object *obj) { - if (obj && yaffs_SkipVerification(obj->myDev)) + if (obj && yaffs_skip_verification(obj->myDev)) return; /* Verify symlink string */ } -void yaffs_VerifySpecial(yaffs_Object *obj) +void yaffs_verify_special(yaffs_Object *obj) { - if (obj && yaffs_SkipVerification(obj->myDev)) + if (obj && yaffs_skip_verification(obj->myDev)) return; } -void yaffs_VerifyObject(yaffs_Object *obj) +void yaffs_verify_obj(yaffs_Object *obj) { yaffs_Device *dev; @@ -366,7 +366,7 @@ void yaffs_VerifyObject(yaffs_Object *obj) dev = obj->myDev; - if (yaffs_SkipVerification(dev)) + if (yaffs_skip_verification(dev)) return; /* Check sane object header chunk */ @@ -377,7 +377,7 @@ void yaffs_VerifyObject(yaffs_Object *obj) chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax); chunkIdOk = chunkInRange || (obj->hdrChunk == 0); chunkValid = chunkInRange && - yaffs_CheckChunkBit(dev, + yaffs_check_chunk_bit(dev, obj->hdrChunk / dev->param.nChunksPerBlock, obj->hdrChunk % dev->param.nChunksPerBlock); chunkShouldNotBeDeleted = chunkInRange && !chunkValid; @@ -391,19 +391,19 @@ void yaffs_VerifyObject(yaffs_Object *obj) chunkShouldNotBeDeleted ? ",marked as deleted" : "")); } - if (chunkValid && !yaffs_SkipNANDVerification(dev)) { + if (chunkValid && !yaffs_skip_nand_verification(dev)) { yaffs_ExtendedTags tags; yaffs_ObjectHeader *oh; - __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__); + __u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__); oh = (yaffs_ObjectHeader *)buffer; - yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer, + yaffs_rd_chunk_tags_nand(dev, obj->hdrChunk, buffer, &tags); - yaffs_VerifyObjectHeader(obj, oh, &tags, 1); + yaffs_verify_oh(obj, oh, &tags, 1); - yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); + yaffs_release_temp_buffer(dev, buffer, __LINE__); } /* Verify it has a parent */ @@ -423,19 +423,19 @@ void yaffs_VerifyObject(yaffs_Object *obj) switch (obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: - yaffs_VerifyFile(obj); + yaffs_verify_file(obj); break; case YAFFS_OBJECT_TYPE_SYMLINK: - yaffs_VerifySymlink(obj); + yaffs_verify_symlink(obj); break; case YAFFS_OBJECT_TYPE_DIRECTORY: - yaffs_VerifyDirectory(obj); + yaffs_verify_dir(obj); break; case YAFFS_OBJECT_TYPE_HARDLINK: - yaffs_VerifyHardLink(obj); + yaffs_verify_link(obj); break; case YAFFS_OBJECT_TYPE_SPECIAL: - yaffs_VerifySpecial(obj); + yaffs_verify_special(obj); break; case YAFFS_OBJECT_TYPE_UNKNOWN: default: @@ -446,13 +446,13 @@ void yaffs_VerifyObject(yaffs_Object *obj) } } -void yaffs_VerifyObjects(yaffs_Device *dev) +void yaffs_verify_objects(yaffs_Device *dev) { yaffs_Object *obj; int i; struct ylist_head *lh; - if (yaffs_SkipVerification(dev)) + if (yaffs_skip_verification(dev)) return; /* Iterate through the objects in each hash entry */ @@ -461,14 +461,14 @@ void yaffs_VerifyObjects(yaffs_Device *dev) ylist_for_each(lh, &dev->objectBucket[i].list) { if (lh) { obj = ylist_entry(lh, yaffs_Object, hashLink); - yaffs_VerifyObject(obj); + yaffs_verify_obj(obj); } } } } -void yaffs_VerifyObjectInDirectory(yaffs_Object *obj) +void yaffs_verify_obj_in_dir(yaffs_Object *obj) { struct ylist_head *lh; yaffs_Object *listObj; @@ -481,7 +481,7 @@ void yaffs_VerifyObjectInDirectory(yaffs_Object *obj) return; } - if (yaffs_SkipVerification(obj->myDev)) + if (yaffs_skip_verification(obj->myDev)) return; if (!obj->parent) { @@ -500,7 +500,7 @@ void yaffs_VerifyObjectInDirectory(yaffs_Object *obj) ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) { if (lh) { listObj = ylist_entry(lh, yaffs_Object, siblings); - yaffs_VerifyObject(listObj); + yaffs_verify_obj(listObj); if (obj == listObj) count++; } @@ -512,7 +512,7 @@ void yaffs_VerifyObjectInDirectory(yaffs_Object *obj) } } -void yaffs_VerifyDirectory(yaffs_Object *directory) +void yaffs_verify_dir(yaffs_Object *directory) { struct ylist_head *lh; yaffs_Object *listObj; @@ -522,7 +522,7 @@ void yaffs_VerifyDirectory(yaffs_Object *directory) return; } - if (yaffs_SkipFullVerification(directory->myDev)) + if (yaffs_skip_full_verification(directory->myDev)) return; if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { @@ -539,22 +539,22 @@ void yaffs_VerifyDirectory(yaffs_Object *directory) T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent)); YBUG(); } - yaffs_VerifyObjectInDirectory(listObj); + yaffs_verify_obj_in_dir(listObj); } } } -static int yaffs_freeVerificationFailures; +static int yaffs_free_verification_failures; -void yaffs_VerifyFreeChunks(yaffs_Device *dev) +void yaffs_verify_free_chunks(yaffs_Device *dev) { int counted; int difference; - if (yaffs_SkipVerification(dev)) + if (yaffs_skip_verification(dev)) return; - counted = yaffs_CountFreeChunks(dev); + counted = yaffs_count_free_chunks(dev); difference = dev->nFreeChunks - counted; @@ -562,11 +562,11 @@ void yaffs_VerifyFreeChunks(yaffs_Device *dev) T(YAFFS_TRACE_ALWAYS, (TSTR("Freechunks verification failure %d %d %d" TENDSTR), dev->nFreeChunks, counted, difference)); - yaffs_freeVerificationFailures++; + yaffs_free_verification_failures++; } } -int yaffs_VerifyFileSanity(yaffs_Object *in) +int yaffs_verify_file_sane(yaffs_Object *in) { #if 0 int chunk; @@ -589,21 +589,21 @@ int yaffs_VerifyFileSanity(yaffs_Object *in) (fSize + in->myDev->nDataBytesPerChunk - 1) / in->myDev->nDataBytesPerChunk; for (chunk = 1; chunk <= nChunks; chunk++) { - tn = yaffs_FindLevel0Tnode(in->myDev, &in->variant.fileVariant, + tn = yaffs_find_tnode_0(in->myDev, &in->variant.fileVariant, chunk); if (tn) { - theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk); + theChunk = yaffs_get_group_base(dev, tn, chunk); - if (yaffs_CheckChunkBits + if (yaffs_check_chunk_bits (dev, theChunk / dev->param.nChunksPerBlock, theChunk % dev->param.nChunksPerBlock)) { - yaffs_ReadChunkTagsFromNAND(in->myDev, theChunk, + yaffs_rd_chunk_tags_nand(in->myDev, theChunk, tags, &chunkDeleted); - if (yaffs_TagsMatch + if (yaffs_tags_match (tags, in->objectId, chunk, chunkDeleted)) { /* found it; */ diff --git a/yaffs_verify.h b/yaffs_verify.h index 8a6f751..ba806ec 100644 --- a/yaffs_verify.h +++ b/yaffs_verify.h @@ -16,24 +16,24 @@ #include "yaffs_guts.h" -void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n); -void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n); -void yaffs_VerifyBlocks(yaffs_Device *dev); - -void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck); -void yaffs_VerifyFile(yaffs_Object *obj); -void yaffs_VerifyHardLink(yaffs_Object *obj); -void yaffs_VerifySymlink(yaffs_Object *obj); -void yaffs_VerifySpecial(yaffs_Object *obj); -void yaffs_VerifyObject(yaffs_Object *obj); -void yaffs_VerifyObjects(yaffs_Device *dev); -void yaffs_VerifyObjectInDirectory(yaffs_Object *obj); -void yaffs_VerifyDirectory(yaffs_Object *directory); -void yaffs_VerifyFreeChunks(yaffs_Device *dev); - -int yaffs_VerifyFileSanity(yaffs_Object *obj); - -int yaffs_SkipVerification(yaffs_Device *dev); +void yaffs_verify_blk(yaffs_Device *dev, yaffs_BlockInfo *bi, int n); +void yaffs_verify_collected_blk(yaffs_Device *dev, yaffs_BlockInfo *bi, int n); +void yaffs_verify_blocks(yaffs_Device *dev); + +void yaffs_verify_oh(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck); +void yaffs_verify_file(yaffs_Object *obj); +void yaffs_verify_link(yaffs_Object *obj); +void yaffs_verify_symlink(yaffs_Object *obj); +void yaffs_verify_special(yaffs_Object *obj); +void yaffs_verify_obj(yaffs_Object *obj); +void yaffs_verify_objects(yaffs_Device *dev); +void yaffs_verify_obj_in_dir(yaffs_Object *obj); +void yaffs_verify_dir(yaffs_Object *directory); +void yaffs_verify_free_chunks(yaffs_Device *dev); + +int yaffs_verify_file_sane(yaffs_Object *obj); + +int yaffs_skip_verification(yaffs_Device *dev); #endif diff --git a/yaffs_vfs.c b/yaffs_vfs.c index 3b25d07..5e18574 100644 --- a/yaffs_vfs.c +++ b/yaffs_vfs.c @@ -93,14 +93,14 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) #include "yaffs_mtdif1.h" #include "yaffs_mtdif2.h" -unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS; +unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS; unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS; unsigned int yaffs_auto_checkpoint = 1; unsigned int yaffs_gc_control = 1; unsigned int yaffs_bg_enable = 1; /* Module Parameters */ -module_param(yaffs_traceMask, uint, 0644); +module_param(yaffs_trace_mask, uint, 0644); module_param(yaffs_wr_attempts, uint, 0644); module_param(yaffs_auto_checkpoint, uint, 0644); module_param(yaffs_gc_control, uint, 0644); @@ -112,7 +112,7 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino); #define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private) #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr))) -#define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode) +#define yaffs_dentry_to_obj(dptr) yaffs_InodeToObject((dptr)->d_inode) #define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->s_fs_info) @@ -186,7 +186,7 @@ static int yaffs_readlink(struct dentry *dentry, char __user *buffer, void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias); static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); -static void yaffs_MarkSuperBlockDirty(yaffs_Device *dev); +static void yaffs_touch_super(yaffs_Device *dev); static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin); @@ -294,17 +294,17 @@ static unsigned yaffs_gc_control_callback(yaffs_Device *dev) return yaffs_gc_control; } -static void yaffs_GrossLock(yaffs_Device *dev) +static void yaffs_gross_lock(yaffs_Device *dev) { T(YAFFS_TRACE_LOCK, (TSTR("yaffs locking %p\n"), current)); - down(&(yaffs_DeviceToLC(dev)->grossLock)); + down(&(yaffs_dev_to_lc(dev)->grossLock)); T(YAFFS_TRACE_LOCK, (TSTR("yaffs locked %p\n"), current)); } -static void yaffs_GrossUnlock(yaffs_Device *dev) +static void yaffs_gross_unlock(yaffs_Device *dev) { T(YAFFS_TRACE_LOCK, (TSTR("yaffs unlocking %p\n"), current)); - up(&(yaffs_DeviceToLC(dev)->grossLock)); + up(&(yaffs_dev_to_lc(dev)->grossLock)); } @@ -343,7 +343,7 @@ struct dentry *yaffs2_get_parent(struct dentry *dentry) if (d_obj) { parent_obj = d_obj->parent; if (parent_obj) { - parent_ino = yaffs_GetObjectInode(parent_obj); + parent_ino = yaffs_get_obj_inode(parent_obj); inode = Y_IGET(sb, parent_ino); if (IS_ERR(inode)) { @@ -418,15 +418,15 @@ static struct yaffs_SearchContext * yaffs_NewSearch(yaffs_Object *dir) dir->variant.directoryVariant.children.next, yaffs_Object,siblings); YINIT_LIST_HEAD(&sc->others); - ylist_add(&sc->others,&(yaffs_DeviceToLC(dev)->searchContexts)); + ylist_add(&sc->others,&(yaffs_dev_to_lc(dev)->searchContexts)); } return sc; } /* - * yaffs_EndSearch() disposes of a search context and cleans up. + * yaffs_search_end() disposes of a search context and cleans up. */ -static void yaffs_EndSearch(struct yaffs_SearchContext * sc) +static void yaffs_search_end(struct yaffs_SearchContext * sc) { if(sc){ ylist_del(&sc->others); @@ -435,11 +435,11 @@ static void yaffs_EndSearch(struct yaffs_SearchContext * sc) } /* - * yaffs_SearchAdvance() moves a search context to the next object. + * yaffs_search_advance() moves a search context to the next object. * Called when the search iterates or when an object removal causes * the search context to be moved to the next object. */ -static void yaffs_SearchAdvance(struct yaffs_SearchContext *sc) +static void yaffs_search_advance(struct yaffs_SearchContext *sc) { if(!sc) return; @@ -458,16 +458,16 @@ static void yaffs_SearchAdvance(struct yaffs_SearchContext *sc) } /* - * yaffs_RemoveObjectCallback() is called when an object is unlinked. + * yaffs_remove_obj_callback() is called when an object is unlinked. * We check open search contexts and advance any which are currently * on the object being iterated. */ -static void yaffs_RemoveObjectCallback(yaffs_Object *obj) +static void yaffs_remove_obj_callback(yaffs_Object *obj) { struct ylist_head *i; struct yaffs_SearchContext *sc; - struct ylist_head *search_contexts = &(yaffs_DeviceToLC(obj->myDev)->searchContexts); + struct ylist_head *search_contexts = &(yaffs_dev_to_lc(obj->myDev)->searchContexts); /* Iterate through the directory search contexts. @@ -478,7 +478,7 @@ static void yaffs_RemoveObjectCallback(yaffs_Object *obj) if (i) { sc = ylist_entry(i, struct yaffs_SearchContext,others); if(sc->nextReturn == obj) - yaffs_SearchAdvance(sc); + yaffs_search_advance(sc); } } @@ -493,13 +493,13 @@ static int yaffs_readlink(struct dentry *dentry, char __user *buffer, unsigned char *alias; int ret; - yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev; + yaffs_Device *dev = yaffs_dentry_to_obj(dentry)->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry)); + alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (!alias) return -ENOMEM; @@ -513,12 +513,12 @@ static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) { unsigned char *alias; int ret; - yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev; + yaffs_Device *dev = yaffs_dentry_to_obj(dentry)->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry)); - yaffs_GrossUnlock(dev); + alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); + yaffs_gross_unlock(dev); if (!alias) { ret = -ENOMEM; @@ -550,21 +550,21 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, yaffs_Device *dev = yaffs_InodeToObject(dir)->myDev; - if(current != yaffs_DeviceToLC(dev)->readdirProcess) - yaffs_GrossLock(dev); + if(current != yaffs_dev_to_lc(dev)->readdirProcess) + yaffs_gross_lock(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_lookup for %d:%s\n"), yaffs_InodeToObject(dir)->objectId, dentry->d_name.name)); - obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir), + obj = yaffs_find_by_name(yaffs_InodeToObject(dir), dentry->d_name.name); - obj = yaffs_GetEquivalentObject(obj); /* in case it was a hardlink */ + obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */ /* Can't hold gross lock when calling yaffs_get_inode() */ - if(current != yaffs_DeviceToLC(dev)->readdirProcess) - yaffs_GrossUnlock(dev); + if(current != yaffs_dev_to_lc(dev)->readdirProcess) + yaffs_gross_unlock(dev); if (obj) { T(YAFFS_TRACE_OS, @@ -614,7 +614,7 @@ static void yaffs_put_inode(struct inode *inode) #endif -static void yaffs_UnstitchObject(struct inode *inode, yaffs_Object *obj) +static void yaffs_unstitch_obj(struct inode *inode, yaffs_Object *obj) { /* Clear the association between the inode and * the yaffs_Object. @@ -626,7 +626,7 @@ static void yaffs_UnstitchObject(struct inode *inode, yaffs_Object *obj) * free happens now. * This should fix the inode inconsistency problem. */ - yaffs_HandleDeferedFree(obj); + yaffs_handle_defered_free(obj); } /* yaffs_evict_inode combines into one operation what was previously done in @@ -653,15 +653,15 @@ static void yaffs_evict_inode( struct inode *inode) if(deleteme && obj){ dev = obj->myDev; - yaffs_GrossLock(dev); - yaffs_DeleteObject(obj); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + yaffs_del_obj(obj); + yaffs_gross_unlock(dev); } if (obj) { dev = obj->myDev; - yaffs_GrossLock(dev); - yaffs_UnstitchObject(inode,obj); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + yaffs_unstitch_obj(inode,obj); + yaffs_gross_unlock(dev); } @@ -670,7 +670,7 @@ static void yaffs_evict_inode( struct inode *inode) static int yaffs_file_flush(struct file *file, fl_owner_t id) { - yaffs_Object *obj = yaffs_DentryToObject(file->f_dentry); + yaffs_Object *obj = yaffs_dentry_to_obj(file->f_dentry); yaffs_Device *dev = obj->myDev; @@ -678,11 +678,11 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id) (TSTR("yaffs_file_flush object %d (%s)\n"), obj->objectId, obj->dirty ? "dirty" : "clean")); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - yaffs_FlushFile(obj, 1, 0); + yaffs_flush_file(obj, 1, 0); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return 0; } @@ -702,7 +702,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) (unsigned)(pg->index << PAGE_CACHE_SHIFT), (unsigned)PAGE_CACHE_SIZE)); - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; @@ -711,13 +711,13 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) pg_buf = kmap(pg); /* FIXME: Can kmap fail? */ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - ret = yaffs_ReadDataFromFile(obj, pg_buf, + ret = yaffs_file_rd(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (ret >= 0) ret = 0; @@ -807,7 +807,7 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc) obj = yaffs_InodeToObject(inode); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_writepage at %08x, size %08x\n"), @@ -816,16 +816,16 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc) (TSTR("writepag0: obj = %05x, ino = %05x\n"), (int)obj->variant.fileVariant.fileSize, (int)inode->i_size)); - nWritten = yaffs_WriteDataToFile(obj, buffer, + nWritten = yaffs_wr_file(obj, buffer, page->index << PAGE_CACHE_SHIFT, nBytes, 0); - yaffs_MarkSuperBlockDirty(dev); + yaffs_touch_super(dev); T(YAFFS_TRACE_OS, (TSTR("writepag1: obj = %05x, ino = %05x\n"), (int)obj->variant.fileVariant.fileSize, (int)inode->i_size)); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); kunmap(page); set_page_writeback(page); @@ -928,7 +928,7 @@ static int yaffs_write_end(struct file *filp, struct address_space *mapping, } -static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) +static void yaffs_fill_inode_from_obj(struct inode *inode, yaffs_Object *obj) { if (inode && obj) { @@ -980,13 +980,13 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) inode->i_mtime.tv_nsec = 0; inode->i_ctime.tv_sec = (time_t) obj->yst_ctime; inode->i_ctime.tv_nsec = 0; - inode->i_size = yaffs_GetObjectFileLength(obj); + inode->i_size = yaffs_get_obj_length(obj); inode->i_blocks = (inode->i_size + 511) >> 9; - inode->i_nlink = yaffs_GetObjectLinkCount(obj); + inode->i_nlink = yaffs_get_obj_link_count(obj); T(YAFFS_TRACE_OS, - (TSTR("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n"), + (TSTR("yaffs_fill_inode mode %x uid %d gid %d size %d count %d\n"), inode->i_mode, inode->i_uid, inode->i_gid, (int)inode->i_size, atomic_read(&inode->i_count))); @@ -1062,11 +1062,11 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, struct inode *inode; yaffs_Device *dev; - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); inode = f->f_dentry->d_inode; @@ -1084,9 +1084,9 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, "to object %d at %d(%x)\n"), (unsigned) n, (unsigned) n, obj->objectId, ipos,ipos)); - nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0); + nWritten = yaffs_wr_file(obj, buf, ipos, n, 0); - yaffs_MarkSuperBlockDirty(dev); + yaffs_touch_super(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_file_write: %d(%x) bytes written\n"), @@ -1106,7 +1106,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, } } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return (nWritten == 0) && (n > 0) ? -ENOSPC : nWritten; } @@ -1122,15 +1122,15 @@ static ssize_t yaffs_hold_space(struct file *f) int nFreeChunks; - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - nFreeChunks = yaffs_GetNumberOfFreeChunks(dev); + nFreeChunks = yaffs_get_n_free_chunks(dev); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return (nFreeChunks > 20) ? 1 : 0; } @@ -1141,14 +1141,14 @@ static void yaffs_release_space(struct file *f) yaffs_Device *dev; - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); } @@ -1190,12 +1190,12 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) char name[YAFFS_MAX_NAME_LENGTH + 1]; - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - yaffs_DeviceToLC(dev)->readdirProcess = current; + yaffs_dev_to_lc(dev)->readdirProcess = current; offset = f->f_pos; @@ -1211,12 +1211,12 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: entry . ino %d \n"), (int)inode->i_ino)); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0){ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); goto out; } - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); offset++; f->f_pos++; } @@ -1224,13 +1224,13 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: entry .. ino %d \n"), (int)f->f_dentry->d_parent->d_inode->i_ino)); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (filldir(dirent, "..", 2, offset, f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0){ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); goto out; } - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); offset++; f->f_pos++; } @@ -1249,16 +1249,16 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) curoffs++; l = sc->nextReturn; if (curoffs >= offset) { - int this_inode = yaffs_GetObjectInode(l); - int this_type = yaffs_GetObjectType(l); + int this_inode = yaffs_get_obj_inode(l); + int this_type = yaffs_get_obj_type(l); - yaffs_GetObjectName(l, name, + yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1); T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: %s inode %d\n"), - name, yaffs_GetObjectInode(l))); + name, yaffs_get_obj_inode(l))); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (filldir(dirent, name, @@ -1266,22 +1266,22 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) offset, this_inode, this_type) < 0){ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); goto out; } - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); offset++; f->f_pos++; } - yaffs_SearchAdvance(sc); + yaffs_search_advance(sc); } out: - yaffs_EndSearch(sc); - yaffs_DeviceToLC(dev)->readdirProcess = NULL; - yaffs_GrossUnlock(dev); + yaffs_search_end(sc); + yaffs_dev_to_lc(dev)->readdirProcess = NULL; + yaffs_gross_unlock(dev); return retVal; } @@ -1327,24 +1327,24 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev = parent->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); switch (mode & S_IFMT) { default: /* Special (socket, fifo, device...) */ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making special\n"))); - obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid, + obj = yaffs_create_special(parent, dentry->d_name.name, mode, uid, gid, old_encode_dev(rdev)); break; case S_IFREG: /* file */ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making file\n"))); - obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid, + obj = yaffs_create_file(parent, dentry->d_name.name, mode, uid, gid); break; case S_IFDIR: /* directory */ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making directory\n"))); - obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode, + obj = yaffs_create_dir(parent, dentry->d_name.name, mode, uid, gid); break; case S_IFLNK: /* symlink */ @@ -1354,7 +1354,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, } /* Can not call yaffs_get_inode() with gross lock held */ - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (obj) { inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj); @@ -1364,7 +1364,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, (TSTR("yaffs_mknod created object %d count = %d\n"), obj->objectId, atomic_read(&inode->i_count))); error = 0; - yaffs_FillInodeFromObject(dir,parent); + yaffs_fill_inode_from_obj(dir,parent); } else { T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod failed making object\n"))); @@ -1403,19 +1403,19 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry) obj = yaffs_InodeToObject(dir); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); retVal = yaffs_Unlink(obj, dentry->d_name.name); if (retVal == YAFFS_OK) { dentry->d_inode->i_nlink--; dir->i_version++; - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); mark_inode_dirty(dentry->d_inode); update_dir_time(dir); return 0; } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return -ENOTEMPTY; } @@ -1435,14 +1435,14 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, obj = yaffs_InodeToObject(inode); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); if (!S_ISDIR(inode->i_mode)) /* Don't link directories */ link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name, obj); if (link) { - old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj); + old_dentry->d_inode->i_nlink = yaffs_get_obj_link_count(obj); d_instantiate(dentry, old_dentry->d_inode); atomic_inc(&old_dentry->d_inode->i_count); T(YAFFS_TRACE_OS, @@ -1451,7 +1451,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, atomic_read(&old_dentry->d_inode->i_count))); } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (link){ update_dir_time(dir); @@ -1472,10 +1472,10 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, T(YAFFS_TRACE_OS, (TSTR("yaffs_symlink\n"))); dev = yaffs_InodeToObject(dir)->myDev; - yaffs_GrossLock(dev); - obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name, + yaffs_gross_lock(dev); + obj = yaffs_create_symlink(yaffs_InodeToObject(dir), dentry->d_name.name, S_IFLNK | S_IRWXUGO, uid, gid, symname); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (obj) { struct inode *inode; @@ -1499,15 +1499,15 @@ static int yaffs_sync_object(struct file *file, int datasync) yaffs_Device *dev; struct dentry *dentry = file->f_path.dentry; - obj = yaffs_DentryToObject(dentry); + obj = yaffs_dentry_to_obj(dentry); dev = obj->myDev; T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, (TSTR("yaffs_sync_object\n"))); - yaffs_GrossLock(dev); - yaffs_FlushFile(obj, 1, datasync); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + yaffs_flush_file(obj, 1, datasync); + yaffs_gross_unlock(dev); return 0; } @@ -1526,10 +1526,10 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, T(YAFFS_TRACE_OS, (TSTR("yaffs_rename\n"))); dev = yaffs_InodeToObject(old_dir)->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); /* Check if the target is an existing directory that is not empty. */ - target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir), + target = yaffs_find_by_name(yaffs_InodeToObject(new_dir), new_dentry->d_name.name); @@ -1542,14 +1542,14 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, retVal = YAFFS_FAIL; } else { /* Now does unlinking internally using shadowing mechanism */ - T(YAFFS_TRACE_OS, (TSTR("calling yaffs_RenameObject\n"))); + T(YAFFS_TRACE_OS, (TSTR("calling yaffs_rename_obj\n"))); - retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir), + retVal = yaffs_rename_obj(yaffs_InodeToObject(old_dir), old_dentry->d_name.name, yaffs_InodeToObject(new_dir), new_dentry->d_name.name); } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (retVal == YAFFS_OK) { if (target) { @@ -1598,14 +1598,14 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) T(YAFFS_TRACE_OS,(TSTR("resize to %d(%x)\n"), (int)(attr->ia_size),(int)(attr->ia_size))); } - yaffs_GrossLock(dev); - result = yaffs_SetAttributes(yaffs_InodeToObject(inode), attr); + yaffs_gross_lock(dev); + result = yaffs_set_attribs(yaffs_InodeToObject(inode), attr); if(result == YAFFS_OK) { error = 0; } else { error = -EPERM; } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); } @@ -1632,13 +1632,13 @@ int yaffs_setxattr(struct dentry *dentry, const char *name, if (error == 0) { int result; dev = obj->myDev; - yaffs_GrossLock(dev); - result = yaffs_SetXAttribute(obj, name, value, size, flags); + yaffs_gross_lock(dev); + result = yaffs_set_xattrib(obj, name, value, size, flags); if(result == YAFFS_OK) error = 0; else if(result < 0) error = result; - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); } T(YAFFS_TRACE_OS, @@ -1662,9 +1662,9 @@ ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, void *buff, if (error == 0) { dev = obj->myDev; - yaffs_GrossLock(dev); - error = yaffs_GetXAttribute(obj, name, buff, size); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + error = yaffs_get_xattrib(obj, name, buff, size); + yaffs_gross_unlock(dev); } T(YAFFS_TRACE_OS, @@ -1688,13 +1688,13 @@ int yaffs_removexattr(struct dentry *dentry, const char *name) if (error == 0) { int result; dev = obj->myDev; - yaffs_GrossLock(dev); - result = yaffs_RemoveXAttribute(obj, name); + yaffs_gross_lock(dev); + result = yaffs_remove_xattrib(obj, name); if(result == YAFFS_OK) error = 0; else if(result < 0) error = result; - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); } T(YAFFS_TRACE_OS, @@ -1717,9 +1717,9 @@ ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) if (error == 0) { dev = obj->myDev; - yaffs_GrossLock(dev); - error = yaffs_ListXAttributes(obj, buff, size); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + error = yaffs_list_xattrib(obj, buff, size); + yaffs_gross_unlock(dev); } T(YAFFS_TRACE_OS, @@ -1733,12 +1733,12 @@ ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) { - yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev; + yaffs_Device *dev = yaffs_dentry_to_obj(dentry)->myDev; struct super_block *sb = dentry->d_sb; T(YAFFS_TRACE_OS, (TSTR("yaffs_statfs\n"))); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); buf->f_type = YAFFS_MAGIC; buf->f_bsize = sb->s_blocksize; @@ -1756,7 +1756,7 @@ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */ buf->f_blocks = bytesInDev; - bytesFree = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) * + bytesFree = ((uint64_t)(yaffs_get_n_free_chunks(dev))) * ((uint64_t)(dev->nDataBytesPerChunk)); do_div(bytesFree, sb->s_blocksize); @@ -1770,7 +1770,7 @@ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) dev->param.nChunksPerBlock / (sb->s_blocksize / dev->nDataBytesPerChunk); buf->f_bfree = - yaffs_GetNumberOfFreeChunks(dev) / + yaffs_get_n_free_chunks(dev) / (sb->s_blocksize / dev->nDataBytesPerChunk); } else { buf->f_blocks = @@ -1779,7 +1779,7 @@ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) (dev->nDataBytesPerChunk / sb->s_blocksize); buf->f_bfree = - yaffs_GetNumberOfFreeChunks(dev) * + yaffs_get_n_free_chunks(dev) * (dev->nDataBytesPerChunk / sb->s_blocksize); } @@ -1787,13 +1787,13 @@ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_ffree = 0; buf->f_bavail = buf->f_bfree; - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return 0; } -static void yaffs_FlushInodes(struct super_block *sb) +static void yaffs_flush_inodes(struct super_block *sb) { struct inode *iptr; yaffs_Object *obj; @@ -1803,30 +1803,30 @@ static void yaffs_FlushInodes(struct super_block *sb) if(obj){ T(YAFFS_TRACE_OS, (TSTR("flushing obj %d\n"), obj->objectId)); - yaffs_FlushFile(obj,1,0); + yaffs_flush_file(obj,1,0); } } } -static void yaffs_FlushSuperBlock(struct super_block *sb, int do_checkpoint) +static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) { yaffs_Device *dev = yaffs_SuperToDevice(sb); if(!dev) return; - yaffs_FlushInodes(sb); - yaffs_UpdateDirtyDirectories(dev); - yaffs_FlushEntireDeviceCache(dev); + yaffs_flush_inodes(sb); + yaffs_update_dirty_dirs(dev); + yaffs_flush_whole_cache(dev); if(do_checkpoint) - yaffs_CheckpointSave(dev); + yaffs_checkpoint_save(dev); } static unsigned yaffs_bg_gc_urgency(yaffs_Device *dev) { unsigned erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock; - struct yaffs_LinuxContext *context = yaffs_DeviceToLC(dev); + struct yaffs_LinuxContext *context = yaffs_dev_to_lc(dev); unsigned scatteredFree = 0; /* Free chunks not in an erased block */ if(erasedChunks < dev->nFreeChunks) @@ -1860,27 +1860,27 @@ static int yaffs_do_sync_fs(struct super_block *sb, request_checkpoint ? "checkpoint requested" : "no checkpoint", oneshot_checkpoint ? " one-shot" : "" )); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); do_checkpoint = ((request_checkpoint && !gc_urgent) || oneshot_checkpoint) && !dev->isCheckpointed; if (sb->s_dirt || do_checkpoint) { - yaffs_FlushSuperBlock(sb, !dev->isCheckpointed && do_checkpoint); + yaffs_flush_super(sb, !dev->isCheckpointed && do_checkpoint); sb->s_dirt = 0; if(oneshot_checkpoint) yaffs_auto_checkpoint &= ~4; } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return 0; } /* * yaffs background thread functions . - * yaffs_BackgroundThread() the thread function - * yaffs_BackgroundStart() launches the background thread. - * yaffs_BackgroundStop() cleans up the background thread. + * yaffs_bg_thread_fn() the thread function + * yaffs_bg_start() launches the background thread. + * yaffs_bg_stop() cleans up the background thread. * * NB: * The thread should only run after the yaffs is initialised @@ -1894,10 +1894,10 @@ void yaffs_background_waker(unsigned long data) wake_up_process((struct task_struct *)data); } -static int yaffs_BackgroundThread(void *data) +static int yaffs_bg_thread_fn(void *data) { yaffs_Device *dev = (yaffs_Device *)data; - struct yaffs_LinuxContext *context = yaffs_DeviceToLC(dev); + struct yaffs_LinuxContext *context = yaffs_dev_to_lc(dev); unsigned long now = jiffies; unsigned long next_dir_update = now; unsigned long next_gc = now; @@ -1922,19 +1922,19 @@ static int yaffs_BackgroundThread(void *data) if(try_to_freeze()) continue; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); now = jiffies; if(time_after(now, next_dir_update) && yaffs_bg_enable){ - yaffs_UpdateDirtyDirectories(dev); + yaffs_update_dirty_dirs(dev); next_dir_update = now + HZ; } if(time_after(now,next_gc) && yaffs_bg_enable){ if(!dev->isCheckpointed){ urgency = yaffs_bg_gc_urgency(dev); - gcResult = yaffs_BackgroundGarbageCollect(dev, urgency); + gcResult = yaffs_bg_gc(dev, urgency); if(urgency > 1) next_gc = now + HZ/20+1; else if(urgency > 0) @@ -1947,7 +1947,7 @@ static int yaffs_BackgroundThread(void *data) */ next_gc = next_dir_update; } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); expires = next_dir_update; if (time_before(next_gc,expires)) expires = next_gc; @@ -1968,17 +1968,17 @@ static int yaffs_BackgroundThread(void *data) return 0; } -static int yaffs_BackgroundStart(yaffs_Device *dev) +static int yaffs_bg_start(yaffs_Device *dev) { int retval = 0; - struct yaffs_LinuxContext *context = yaffs_DeviceToLC(dev); + struct yaffs_LinuxContext *context = yaffs_dev_to_lc(dev); if(dev->readOnly) return -1; context->bgRunning = 1; - context->bgThread = kthread_run(yaffs_BackgroundThread, + context->bgThread = kthread_run(yaffs_bg_thread_fn, (void *)dev,"yaffs-bg-%d",context->mount_id); if(IS_ERR(context->bgThread)){ @@ -1989,9 +1989,9 @@ static int yaffs_BackgroundStart(yaffs_Device *dev) return retval; } -static void yaffs_BackgroundStop(yaffs_Device *dev) +static void yaffs_bg_stop(yaffs_Device *dev) { - struct yaffs_LinuxContext *ctxt = yaffs_DeviceToLC(dev); + struct yaffs_LinuxContext *ctxt = yaffs_dev_to_lc(dev); ctxt->bgRunning = 0; @@ -2048,13 +2048,13 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) * need to lock again. */ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - obj = yaffs_FindObjectByNumber(dev, inode->i_ino); + obj = yaffs_find_by_number(dev, inode->i_ino); - yaffs_FillInodeFromObject(inode, obj); + yaffs_fill_inode_from_obj(inode, obj); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); unlock_new_inode(inode); return inode; @@ -2071,29 +2071,29 @@ static void yaffs_put_super(struct super_block *sb) T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, (TSTR("Shutting down yaffs background thread\n"))); - yaffs_BackgroundStop(dev); + yaffs_bg_stop(dev); T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, (TSTR("yaffs background thread shut down\n"))); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - yaffs_FlushSuperBlock(sb,1); + yaffs_flush_super(sb,1); - if (yaffs_DeviceToLC(dev)->putSuperFunc) - yaffs_DeviceToLC(dev)->putSuperFunc(sb); + if (yaffs_dev_to_lc(dev)->putSuperFunc) + yaffs_dev_to_lc(dev)->putSuperFunc(sb); - yaffs_Deinitialise(dev); + yaffs_deinitialise(dev); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); down(&yaffs_context_lock); - ylist_del_init(&(yaffs_DeviceToLC(dev)->contextList)); + ylist_del_init(&(yaffs_dev_to_lc(dev)->contextList)); up(&yaffs_context_lock); - if (yaffs_DeviceToLC(dev)->spareBuffer) { - YFREE(yaffs_DeviceToLC(dev)->spareBuffer); - yaffs_DeviceToLC(dev)->spareBuffer = NULL; + if (yaffs_dev_to_lc(dev)->spareBuffer) { + YFREE(yaffs_dev_to_lc(dev)->spareBuffer); + yaffs_dev_to_lc(dev)->spareBuffer = NULL; } kfree(dev); @@ -2102,7 +2102,7 @@ static void yaffs_put_super(struct super_block *sb) static void yaffs_MTDPutSuper(struct super_block *sb) { - struct mtd_info *mtd = yaffs_DeviceToMtd(yaffs_SuperToDevice(sb)); + struct mtd_info *mtd = yaffs_dev_to_mtd(yaffs_SuperToDevice(sb)); if (mtd->sync) mtd->sync(mtd); @@ -2111,11 +2111,11 @@ static void yaffs_MTDPutSuper(struct super_block *sb) } -static void yaffs_MarkSuperBlockDirty(yaffs_Device *dev) +static void yaffs_touch_super(yaffs_Device *dev) { - struct super_block *sb = yaffs_DeviceToLC(dev)->superBlock; + struct super_block *sb = yaffs_dev_to_lc(dev)->superBlock; - T(YAFFS_TRACE_OS, (TSTR("yaffs_MarkSuperBlockDirty() sb = %p\n"), sb)); + T(YAFFS_TRACE_OS, (TSTR("yaffs_touch_super() sb = %p\n"), sb)); if (sb) sb->s_dirt = 1; } @@ -2463,7 +2463,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, nandmtd2_ReadChunkWithTagsFromNAND; param->markNANDBlockBad = nandmtd2_MarkNANDBlockBad; param->queryNANDBlock = nandmtd2_QueryNANDBlock; - yaffs_DeviceToLC(dev)->spareBuffer = YMALLOC(mtd->oobsize); + yaffs_dev_to_lc(dev)->spareBuffer = YMALLOC(mtd->oobsize); param->isYaffs2 = 1; param->totalBytesPerChunk = mtd->writesize; param->nChunksPerBlock = mtd->erasesize / mtd->writesize; @@ -2485,12 +2485,12 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, param->eraseBlockInNAND = nandmtd_EraseBlockInNAND; param->initialiseNAND = nandmtd_InitialiseNAND; - yaffs_DeviceToLC(dev)->putSuperFunc = yaffs_MTDPutSuper; + yaffs_dev_to_lc(dev)->putSuperFunc = yaffs_MTDPutSuper; - param->markSuperBlockDirty = yaffs_MarkSuperBlockDirty; + param->markSuperBlockDirty = yaffs_touch_super; param->gcControl = yaffs_gc_control_callback; - yaffs_DeviceToLC(dev)->superBlock= sb; + yaffs_dev_to_lc(dev)->superBlock= sb; #ifndef CONFIG_YAFFS_DOES_ECC @@ -2517,32 +2517,32 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, } context->mount_id = mount_id; - ylist_add_tail(&(yaffs_DeviceToLC(dev)->contextList), &yaffs_context_list); + ylist_add_tail(&(yaffs_dev_to_lc(dev)->contextList), &yaffs_context_list); up(&yaffs_context_lock); /* Directory search handling...*/ - YINIT_LIST_HEAD(&(yaffs_DeviceToLC(dev)->searchContexts)); - param->removeObjectCallback = yaffs_RemoveObjectCallback; + YINIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->searchContexts)); + param->removeObjectCallback = yaffs_remove_obj_callback; - init_MUTEX(&(yaffs_DeviceToLC(dev)->grossLock)); + init_MUTEX(&(yaffs_dev_to_lc(dev)->grossLock)); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - err = yaffs_GutsInitialise(dev); + err = yaffs_guts_initialise(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: guts initialised %s\n"), (err == YAFFS_OK) ? "OK" : "FAILED")); if(err == YAFFS_OK) - yaffs_BackgroundStart(dev); + yaffs_bg_start(dev); if(!context->bgThread) param->deferDirectoryUpdate = 0; /* Release lock before yaffs_get_inode() */ - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); /* Create root inode */ if (err == YAFFS_OK) @@ -2823,7 +2823,7 @@ static int yaffs_proc_write_trace_options(struct file *file, const char *buf, int add, len = 0; int pos = 0; - rg = yaffs_traceMask; + rg = yaffs_trace_mask; while (!done && (pos < count)) { done = 1; @@ -2887,9 +2887,9 @@ static int yaffs_proc_write_trace_options(struct file *file, const char *buf, } } - yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS; + yaffs_trace_mask = rg | YAFFS_TRACE_ALWAYS; - printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask); + printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_trace_mask); if (rg & YAFFS_TRACE_ALWAYS) { for (i = 0; mask_flags[i].mask_name != NULL; i++) { diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c index c61da67..e495153 100644 --- a/yaffs_vfs_multi.c +++ b/yaffs_vfs_multi.c @@ -170,7 +170,7 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) #include "yaffs_mtdif1.h" #include "yaffs_mtdif2.h" -unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS; +unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS; unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS; unsigned int yaffs_auto_checkpoint = 1; unsigned int yaffs_gc_control = 1; @@ -178,13 +178,13 @@ unsigned int yaffs_bg_enable = 1; /* Module Parameters */ #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -module_param(yaffs_traceMask, uint, 0644); +module_param(yaffs_trace_mask, uint, 0644); module_param(yaffs_wr_attempts, uint, 0644); module_param(yaffs_auto_checkpoint, uint, 0644); module_param(yaffs_gc_control, uint, 0644); module_param(yaffs_bg_enable, uint, 0644); #else -MODULE_PARM(yaffs_traceMask, "i"); +MODULE_PARM(yaffs_trace_mask, "i"); MODULE_PARM(yaffs_wr_attempts, "i"); MODULE_PARM(yaffs_auto_checkpoint, "i"); MODULE_PARM(yaffs_gc_control, "i"); @@ -210,7 +210,7 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino); #endif #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr))) -#define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode) +#define yaffs_dentry_to_obj(dptr) yaffs_InodeToObject((dptr)->d_inode) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) #define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->s_fs_info) @@ -340,7 +340,7 @@ static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); #endif -static void yaffs_MarkSuperBlockDirty(yaffs_Device *dev); +static void yaffs_touch_super(yaffs_Device *dev); static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin); @@ -512,17 +512,17 @@ static unsigned yaffs_gc_control_callback(yaffs_Device *dev) return yaffs_gc_control; } -static void yaffs_GrossLock(yaffs_Device *dev) +static void yaffs_gross_lock(yaffs_Device *dev) { T(YAFFS_TRACE_LOCK, (TSTR("yaffs locking %p\n"), current)); - down(&(yaffs_DeviceToLC(dev)->grossLock)); + down(&(yaffs_dev_to_lc(dev)->grossLock)); T(YAFFS_TRACE_LOCK, (TSTR("yaffs locked %p\n"), current)); } -static void yaffs_GrossUnlock(yaffs_Device *dev) +static void yaffs_gross_unlock(yaffs_Device *dev) { T(YAFFS_TRACE_LOCK, (TSTR("yaffs unlocking %p\n"), current)); - up(&(yaffs_DeviceToLC(dev)->grossLock)); + up(&(yaffs_dev_to_lc(dev)->grossLock)); } #ifdef YAFFS_COMPILE_EXPORTFS @@ -560,7 +560,7 @@ struct dentry *yaffs2_get_parent(struct dentry *dentry) if (d_obj) { parent_obj = d_obj->parent; if (parent_obj) { - parent_ino = yaffs_GetObjectInode(parent_obj); + parent_ino = yaffs_get_obj_inode(parent_obj); inode = Y_IGET(sb, parent_ino); if (IS_ERR(inode)) { @@ -637,15 +637,15 @@ static struct yaffs_SearchContext * yaffs_NewSearch(yaffs_Object *dir) dir->variant.directoryVariant.children.next, yaffs_Object,siblings); YINIT_LIST_HEAD(&sc->others); - ylist_add(&sc->others,&(yaffs_DeviceToLC(dev)->searchContexts)); + ylist_add(&sc->others,&(yaffs_dev_to_lc(dev)->searchContexts)); } return sc; } /* - * yaffs_EndSearch() disposes of a search context and cleans up. + * yaffs_search_end() disposes of a search context and cleans up. */ -static void yaffs_EndSearch(struct yaffs_SearchContext * sc) +static void yaffs_search_end(struct yaffs_SearchContext * sc) { if(sc){ ylist_del(&sc->others); @@ -654,11 +654,11 @@ static void yaffs_EndSearch(struct yaffs_SearchContext * sc) } /* - * yaffs_SearchAdvance() moves a search context to the next object. + * yaffs_search_advance() moves a search context to the next object. * Called when the search iterates or when an object removal causes * the search context to be moved to the next object. */ -static void yaffs_SearchAdvance(struct yaffs_SearchContext *sc) +static void yaffs_search_advance(struct yaffs_SearchContext *sc) { if(!sc) return; @@ -677,16 +677,16 @@ static void yaffs_SearchAdvance(struct yaffs_SearchContext *sc) } /* - * yaffs_RemoveObjectCallback() is called when an object is unlinked. + * yaffs_remove_obj_callback() is called when an object is unlinked. * We check open search contexts and advance any which are currently * on the object being iterated. */ -static void yaffs_RemoveObjectCallback(yaffs_Object *obj) +static void yaffs_remove_obj_callback(yaffs_Object *obj) { struct ylist_head *i; struct yaffs_SearchContext *sc; - struct ylist_head *search_contexts = &(yaffs_DeviceToLC(obj->myDev)->searchContexts); + struct ylist_head *search_contexts = &(yaffs_dev_to_lc(obj->myDev)->searchContexts); /* Iterate through the directory search contexts. @@ -697,7 +697,7 @@ static void yaffs_RemoveObjectCallback(yaffs_Object *obj) if (i) { sc = ylist_entry(i, struct yaffs_SearchContext,others); if(sc->nextReturn == obj) - yaffs_SearchAdvance(sc); + yaffs_search_advance(sc); } } @@ -712,13 +712,13 @@ static int yaffs_readlink(struct dentry *dentry, char __user *buffer, unsigned char *alias; int ret; - yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev; + yaffs_Device *dev = yaffs_dentry_to_obj(dentry)->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry)); + alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (!alias) return -ENOMEM; @@ -736,12 +736,12 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) { unsigned char *alias; int ret; - yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev; + yaffs_Device *dev = yaffs_dentry_to_obj(dentry)->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry)); - yaffs_GrossUnlock(dev); + alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); + yaffs_gross_unlock(dev); if (!alias) { ret = -ENOMEM; @@ -786,21 +786,21 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) yaffs_Device *dev = yaffs_InodeToObject(dir)->myDev; - if(current != yaffs_DeviceToLC(dev)->readdirProcess) - yaffs_GrossLock(dev); + if(current != yaffs_dev_to_lc(dev)->readdirProcess) + yaffs_gross_lock(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_lookup for %d:%s\n"), yaffs_InodeToObject(dir)->objectId, dentry->d_name.name)); - obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir), + obj = yaffs_find_by_name(yaffs_InodeToObject(dir), dentry->d_name.name); - obj = yaffs_GetEquivalentObject(obj); /* in case it was a hardlink */ + obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */ /* Can't hold gross lock when calling yaffs_get_inode() */ - if(current != yaffs_DeviceToLC(dev)->readdirProcess) - yaffs_GrossUnlock(dev); + if(current != yaffs_dev_to_lc(dev)->readdirProcess) + yaffs_gross_unlock(dev); if (obj) { T(YAFFS_TRACE_OS, @@ -850,7 +850,7 @@ static void yaffs_put_inode(struct inode *inode) #endif -static void yaffs_UnstitchObject(struct inode *inode, yaffs_Object *obj) +static void yaffs_unstitch_obj(struct inode *inode, yaffs_Object *obj) { /* Clear the association between the inode and * the yaffs_Object. @@ -862,7 +862,7 @@ static void yaffs_UnstitchObject(struct inode *inode, yaffs_Object *obj) * free happens now. * This should fix the inode inconsistency problem. */ - yaffs_HandleDeferedFree(obj); + yaffs_handle_defered_free(obj); } #ifdef YAFFS_HAS_EVICT_INODE @@ -890,15 +890,15 @@ static void yaffs_evict_inode( struct inode *inode) if(deleteme && obj){ dev = obj->myDev; - yaffs_GrossLock(dev); - yaffs_DeleteObject(obj); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + yaffs_del_obj(obj); + yaffs_gross_unlock(dev); } if (obj) { dev = obj->myDev; - yaffs_GrossLock(dev); - yaffs_UnstitchObject(inode,obj); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + yaffs_unstitch_obj(inode,obj); + yaffs_gross_unlock(dev); } @@ -926,9 +926,9 @@ static void yaffs_clear_inode(struct inode *inode) if (obj) { dev = obj->myDev; - yaffs_GrossLock(dev); - yaffs_UnstitchObject(inode,obj); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + yaffs_unstitch_obj(inode,obj); + yaffs_gross_unlock(dev); } } @@ -950,9 +950,9 @@ static void yaffs_delete_inode(struct inode *inode) if (obj) { dev = obj->myDev; - yaffs_GrossLock(dev); - yaffs_DeleteObject(obj); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + yaffs_del_obj(obj); + yaffs_gross_unlock(dev); } #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13)) truncate_inode_pages(&inode->i_data, 0); @@ -968,7 +968,7 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id) static int yaffs_file_flush(struct file *file) #endif { - yaffs_Object *obj = yaffs_DentryToObject(file->f_dentry); + yaffs_Object *obj = yaffs_dentry_to_obj(file->f_dentry); yaffs_Device *dev = obj->myDev; @@ -976,11 +976,11 @@ static int yaffs_file_flush(struct file *file) (TSTR("yaffs_file_flush object %d (%s)\n"), obj->objectId, obj->dirty ? "dirty" : "clean")); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - yaffs_FlushFile(obj, 1, 0); + yaffs_flush_file(obj, 1, 0); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return 0; } @@ -1000,7 +1000,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) (unsigned)(pg->index << PAGE_CACHE_SHIFT), (unsigned)PAGE_CACHE_SIZE)); - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; @@ -1014,13 +1014,13 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) pg_buf = kmap(pg); /* FIXME: Can kmap fail? */ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - ret = yaffs_ReadDataFromFile(obj, pg_buf, + ret = yaffs_file_rd(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (ret >= 0) ret = 0; @@ -1114,7 +1114,7 @@ static int yaffs_writepage(struct page *page) obj = yaffs_InodeToObject(inode); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_writepage at %08x, size %08x\n"), @@ -1123,16 +1123,16 @@ static int yaffs_writepage(struct page *page) (TSTR("writepag0: obj = %05x, ino = %05x\n"), (int)obj->variant.fileVariant.fileSize, (int)inode->i_size)); - nWritten = yaffs_WriteDataToFile(obj, buffer, + nWritten = yaffs_wr_file(obj, buffer, page->index << PAGE_CACHE_SHIFT, nBytes, 0); - yaffs_MarkSuperBlockDirty(dev); + yaffs_touch_super(dev); T(YAFFS_TRACE_OS, (TSTR("writepag1: obj = %05x, ino = %05x\n"), (int)obj->variant.fileVariant.fileSize, (int)inode->i_size)); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); kunmap(page); set_page_writeback(page); @@ -1296,7 +1296,7 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, #endif -static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) +static void yaffs_fill_inode_from_obj(struct inode *inode, yaffs_Object *obj) { if (inode && obj) { @@ -1357,13 +1357,13 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) inode->i_mtime = obj->yst_mtime; inode->i_ctime = obj->yst_ctime; #endif - inode->i_size = yaffs_GetObjectFileLength(obj); + inode->i_size = yaffs_get_obj_length(obj); inode->i_blocks = (inode->i_size + 511) >> 9; - inode->i_nlink = yaffs_GetObjectLinkCount(obj); + inode->i_nlink = yaffs_get_obj_link_count(obj); T(YAFFS_TRACE_OS, - (TSTR("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n"), + (TSTR("yaffs_fill_inode mode %x uid %d gid %d size %d count %d\n"), inode->i_mode, inode->i_uid, inode->i_gid, (int)inode->i_size, atomic_read(&inode->i_count))); @@ -1444,11 +1444,11 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, struct inode *inode; yaffs_Device *dev; - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); inode = f->f_dentry->d_inode; @@ -1466,9 +1466,9 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, "to object %d at %d(%x)\n"), (unsigned) n, (unsigned) n, obj->objectId, ipos,ipos)); - nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0); + nWritten = yaffs_wr_file(obj, buf, ipos, n, 0); - yaffs_MarkSuperBlockDirty(dev); + yaffs_touch_super(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_file_write: %d(%x) bytes written\n"), @@ -1488,7 +1488,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, } } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return (nWritten == 0) && (n > 0) ? -ENOSPC : nWritten; } @@ -1504,15 +1504,15 @@ static ssize_t yaffs_hold_space(struct file *f) int nFreeChunks; - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - nFreeChunks = yaffs_GetNumberOfFreeChunks(dev); + nFreeChunks = yaffs_get_n_free_chunks(dev); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return (nFreeChunks > 20) ? 1 : 0; } @@ -1523,14 +1523,14 @@ static void yaffs_release_space(struct file *f) yaffs_Device *dev; - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); } @@ -1572,12 +1572,12 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) char name[YAFFS_MAX_NAME_LENGTH + 1]; - obj = yaffs_DentryToObject(f->f_dentry); + obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - yaffs_DeviceToLC(dev)->readdirProcess = current; + yaffs_dev_to_lc(dev)->readdirProcess = current; offset = f->f_pos; @@ -1593,12 +1593,12 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: entry . ino %d \n"), (int)inode->i_ino)); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0){ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); goto out; } - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); offset++; f->f_pos++; } @@ -1606,13 +1606,13 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: entry .. ino %d \n"), (int)f->f_dentry->d_parent->d_inode->i_ino)); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (filldir(dirent, "..", 2, offset, f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0){ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); goto out; } - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); offset++; f->f_pos++; } @@ -1631,16 +1631,16 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) curoffs++; l = sc->nextReturn; if (curoffs >= offset) { - int this_inode = yaffs_GetObjectInode(l); - int this_type = yaffs_GetObjectType(l); + int this_inode = yaffs_get_obj_inode(l); + int this_type = yaffs_get_obj_type(l); - yaffs_GetObjectName(l, name, + yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1); T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: %s inode %d\n"), - name, yaffs_GetObjectInode(l))); + name, yaffs_get_obj_inode(l))); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (filldir(dirent, name, @@ -1648,22 +1648,22 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) offset, this_inode, this_type) < 0){ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); goto out; } - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); offset++; f->f_pos++; } - yaffs_SearchAdvance(sc); + yaffs_search_advance(sc); } out: - yaffs_EndSearch(sc); - yaffs_DeviceToLC(dev)->readdirProcess = NULL; - yaffs_GrossUnlock(dev); + yaffs_search_end(sc); + yaffs_dev_to_lc(dev)->readdirProcess = NULL; + yaffs_gross_unlock(dev); return retVal; } @@ -1718,29 +1718,29 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev = parent->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); switch (mode & S_IFMT) { default: /* Special (socket, fifo, device...) */ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making special\n"))); #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid, + obj = yaffs_create_special(parent, dentry->d_name.name, mode, uid, gid, old_encode_dev(rdev)); #else - obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid, + obj = yaffs_create_special(parent, dentry->d_name.name, mode, uid, gid, rdev); #endif break; case S_IFREG: /* file */ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making file\n"))); - obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid, + obj = yaffs_create_file(parent, dentry->d_name.name, mode, uid, gid); break; case S_IFDIR: /* directory */ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making directory\n"))); - obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode, + obj = yaffs_create_dir(parent, dentry->d_name.name, mode, uid, gid); break; case S_IFLNK: /* symlink */ @@ -1750,7 +1750,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, } /* Can not call yaffs_get_inode() with gross lock held */ - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (obj) { inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj); @@ -1760,7 +1760,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, (TSTR("yaffs_mknod created object %d count = %d\n"), obj->objectId, atomic_read(&inode->i_count))); error = 0; - yaffs_FillInodeFromObject(dir,parent); + yaffs_fill_inode_from_obj(dir,parent); } else { T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod failed making object\n"))); @@ -1803,19 +1803,19 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry) obj = yaffs_InodeToObject(dir); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); retVal = yaffs_Unlink(obj, dentry->d_name.name); if (retVal == YAFFS_OK) { dentry->d_inode->i_nlink--; dir->i_version++; - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); mark_inode_dirty(dentry->d_inode); update_dir_time(dir); return 0; } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return -ENOTEMPTY; } @@ -1835,14 +1835,14 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, obj = yaffs_InodeToObject(inode); dev = obj->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); if (!S_ISDIR(inode->i_mode)) /* Don't link directories */ link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name, obj); if (link) { - old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj); + old_dentry->d_inode->i_nlink = yaffs_get_obj_link_count(obj); d_instantiate(dentry, old_dentry->d_inode); atomic_inc(&old_dentry->d_inode->i_count); T(YAFFS_TRACE_OS, @@ -1851,7 +1851,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, atomic_read(&old_dentry->d_inode->i_count))); } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (link){ update_dir_time(dir); @@ -1872,10 +1872,10 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, T(YAFFS_TRACE_OS, (TSTR("yaffs_symlink\n"))); dev = yaffs_InodeToObject(dir)->myDev; - yaffs_GrossLock(dev); - obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name, + yaffs_gross_lock(dev); + obj = yaffs_create_symlink(yaffs_InodeToObject(dir), dentry->d_name.name, S_IFLNK | S_IRWXUGO, uid, gid, symname); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (obj) { struct inode *inode; @@ -1906,15 +1906,15 @@ static int yaffs_sync_object(struct file *file, struct dentry *dentry, struct dentry *dentry = file->f_path.dentry; #endif - obj = yaffs_DentryToObject(dentry); + obj = yaffs_dentry_to_obj(dentry); dev = obj->myDev; T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, (TSTR("yaffs_sync_object\n"))); - yaffs_GrossLock(dev); - yaffs_FlushFile(obj, 1, datasync); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + yaffs_flush_file(obj, 1, datasync); + yaffs_gross_unlock(dev); return 0; } @@ -1933,10 +1933,10 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, T(YAFFS_TRACE_OS, (TSTR("yaffs_rename\n"))); dev = yaffs_InodeToObject(old_dir)->myDev; - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); /* Check if the target is an existing directory that is not empty. */ - target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir), + target = yaffs_find_by_name(yaffs_InodeToObject(new_dir), new_dentry->d_name.name); @@ -1949,14 +1949,14 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, retVal = YAFFS_FAIL; } else { /* Now does unlinking internally using shadowing mechanism */ - T(YAFFS_TRACE_OS, (TSTR("calling yaffs_RenameObject\n"))); + T(YAFFS_TRACE_OS, (TSTR("calling yaffs_rename_obj\n"))); - retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir), + retVal = yaffs_rename_obj(yaffs_InodeToObject(old_dir), old_dentry->d_name.name, yaffs_InodeToObject(new_dir), new_dentry->d_name.name); } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); if (retVal == YAFFS_OK) { if (target) { @@ -2005,14 +2005,14 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) T(YAFFS_TRACE_OS,(TSTR("resize to %d(%x)\n"), (int)(attr->ia_size),(int)(attr->ia_size))); } - yaffs_GrossLock(dev); - result = yaffs_SetAttributes(yaffs_InodeToObject(inode), attr); + yaffs_gross_lock(dev); + result = yaffs_set_attribs(yaffs_InodeToObject(inode), attr); if(result == YAFFS_OK) { error = 0; } else { error = -EPERM; } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); } @@ -2039,13 +2039,13 @@ int yaffs_setxattr(struct dentry *dentry, const char *name, if (error == 0) { int result; dev = obj->myDev; - yaffs_GrossLock(dev); - result = yaffs_SetXAttribute(obj, name, value, size, flags); + yaffs_gross_lock(dev); + result = yaffs_set_xattrib(obj, name, value, size, flags); if(result == YAFFS_OK) error = 0; else if(result < 0) error = result; - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); } T(YAFFS_TRACE_OS, @@ -2069,9 +2069,9 @@ ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, void *buff, if (error == 0) { dev = obj->myDev; - yaffs_GrossLock(dev); - error = yaffs_GetXAttribute(obj, name, buff, size); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + error = yaffs_get_xattrib(obj, name, buff, size); + yaffs_gross_unlock(dev); } T(YAFFS_TRACE_OS, @@ -2095,13 +2095,13 @@ int yaffs_removexattr(struct dentry *dentry, const char *name) if (error == 0) { int result; dev = obj->myDev; - yaffs_GrossLock(dev); - result = yaffs_RemoveXAttribute(obj, name); + yaffs_gross_lock(dev); + result = yaffs_remove_xattrib(obj, name); if(result == YAFFS_OK) error = 0; else if(result < 0) error = result; - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); } T(YAFFS_TRACE_OS, @@ -2124,9 +2124,9 @@ ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) if (error == 0) { dev = obj->myDev; - yaffs_GrossLock(dev); - error = yaffs_ListXAttributes(obj, buff, size); - yaffs_GrossUnlock(dev); + yaffs_gross_lock(dev); + error = yaffs_list_xattrib(obj, buff, size); + yaffs_gross_unlock(dev); } T(YAFFS_TRACE_OS, @@ -2141,7 +2141,7 @@ ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) { - yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev; + yaffs_Device *dev = yaffs_dentry_to_obj(dentry)->myDev; struct super_block *sb = dentry->d_sb; #elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf) @@ -2155,7 +2155,7 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) T(YAFFS_TRACE_OS, (TSTR("yaffs_statfs\n"))); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); buf->f_type = YAFFS_MAGIC; buf->f_bsize = sb->s_blocksize; @@ -2173,7 +2173,7 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */ buf->f_blocks = bytesInDev; - bytesFree = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) * + bytesFree = ((uint64_t)(yaffs_get_n_free_chunks(dev))) * ((uint64_t)(dev->nDataBytesPerChunk)); do_div(bytesFree, sb->s_blocksize); @@ -2187,7 +2187,7 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) dev->param.nChunksPerBlock / (sb->s_blocksize / dev->nDataBytesPerChunk); buf->f_bfree = - yaffs_GetNumberOfFreeChunks(dev) / + yaffs_get_n_free_chunks(dev) / (sb->s_blocksize / dev->nDataBytesPerChunk); } else { buf->f_blocks = @@ -2196,7 +2196,7 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) (dev->nDataBytesPerChunk / sb->s_blocksize); buf->f_bfree = - yaffs_GetNumberOfFreeChunks(dev) * + yaffs_get_n_free_chunks(dev) * (dev->nDataBytesPerChunk / sb->s_blocksize); } @@ -2204,13 +2204,13 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) buf->f_ffree = 0; buf->f_bavail = buf->f_bfree; - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return 0; } -static void yaffs_FlushInodes(struct super_block *sb) +static void yaffs_flush_inodes(struct super_block *sb) { struct inode *iptr; yaffs_Object *obj; @@ -2220,30 +2220,30 @@ static void yaffs_FlushInodes(struct super_block *sb) if(obj){ T(YAFFS_TRACE_OS, (TSTR("flushing obj %d\n"), obj->objectId)); - yaffs_FlushFile(obj,1,0); + yaffs_flush_file(obj,1,0); } } } -static void yaffs_FlushSuperBlock(struct super_block *sb, int do_checkpoint) +static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) { yaffs_Device *dev = yaffs_SuperToDevice(sb); if(!dev) return; - yaffs_FlushInodes(sb); - yaffs_UpdateDirtyDirectories(dev); - yaffs_FlushEntireDeviceCache(dev); + yaffs_flush_inodes(sb); + yaffs_update_dirty_dirs(dev); + yaffs_flush_whole_cache(dev); if(do_checkpoint) - yaffs_CheckpointSave(dev); + yaffs_checkpoint_save(dev); } static unsigned yaffs_bg_gc_urgency(yaffs_Device *dev) { unsigned erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock; - struct yaffs_LinuxContext *context = yaffs_DeviceToLC(dev); + struct yaffs_LinuxContext *context = yaffs_dev_to_lc(dev); unsigned scatteredFree = 0; /* Free chunks not in an erased block */ if(erasedChunks < dev->nFreeChunks) @@ -2277,27 +2277,27 @@ static int yaffs_do_sync_fs(struct super_block *sb, request_checkpoint ? "checkpoint requested" : "no checkpoint", oneshot_checkpoint ? " one-shot" : "" )); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); do_checkpoint = ((request_checkpoint && !gc_urgent) || oneshot_checkpoint) && !dev->isCheckpointed; if (sb->s_dirt || do_checkpoint) { - yaffs_FlushSuperBlock(sb, !dev->isCheckpointed && do_checkpoint); + yaffs_flush_super(sb, !dev->isCheckpointed && do_checkpoint); sb->s_dirt = 0; if(oneshot_checkpoint) yaffs_auto_checkpoint &= ~4; } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); return 0; } /* * yaffs background thread functions . - * yaffs_BackgroundThread() the thread function - * yaffs_BackgroundStart() launches the background thread. - * yaffs_BackgroundStop() cleans up the background thread. + * yaffs_bg_thread_fn() the thread function + * yaffs_bg_start() launches the background thread. + * yaffs_bg_stop() cleans up the background thread. * * NB: * The thread should only run after the yaffs is initialised @@ -2312,10 +2312,10 @@ void yaffs_background_waker(unsigned long data) wake_up_process((struct task_struct *)data); } -static int yaffs_BackgroundThread(void *data) +static int yaffs_bg_thread_fn(void *data) { yaffs_Device *dev = (yaffs_Device *)data; - struct yaffs_LinuxContext *context = yaffs_DeviceToLC(dev); + struct yaffs_LinuxContext *context = yaffs_dev_to_lc(dev); unsigned long now = jiffies; unsigned long next_dir_update = now; unsigned long next_gc = now; @@ -2343,19 +2343,19 @@ static int yaffs_BackgroundThread(void *data) if(try_to_freeze()) continue; #endif - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); now = jiffies; if(time_after(now, next_dir_update) && yaffs_bg_enable){ - yaffs_UpdateDirtyDirectories(dev); + yaffs_update_dirty_dirs(dev); next_dir_update = now + HZ; } if(time_after(now,next_gc) && yaffs_bg_enable){ if(!dev->isCheckpointed){ urgency = yaffs_bg_gc_urgency(dev); - gcResult = yaffs_BackgroundGarbageCollect(dev, urgency); + gcResult = yaffs_bg_gc(dev, urgency); if(urgency > 1) next_gc = now + HZ/20+1; else if(urgency > 0) @@ -2368,7 +2368,7 @@ static int yaffs_BackgroundThread(void *data) */ next_gc = next_dir_update; } - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); #if 1 expires = next_dir_update; if (time_before(next_gc,expires)) @@ -2393,17 +2393,17 @@ static int yaffs_BackgroundThread(void *data) return 0; } -static int yaffs_BackgroundStart(yaffs_Device *dev) +static int yaffs_bg_start(yaffs_Device *dev) { int retval = 0; - struct yaffs_LinuxContext *context = yaffs_DeviceToLC(dev); + struct yaffs_LinuxContext *context = yaffs_dev_to_lc(dev); if(dev->readOnly) return -1; context->bgRunning = 1; - context->bgThread = kthread_run(yaffs_BackgroundThread, + context->bgThread = kthread_run(yaffs_bg_thread_fn, (void *)dev,"yaffs-bg-%d",context->mount_id); if(IS_ERR(context->bgThread)){ @@ -2414,9 +2414,9 @@ static int yaffs_BackgroundStart(yaffs_Device *dev) return retval; } -static void yaffs_BackgroundStop(yaffs_Device *dev) +static void yaffs_bg_stop(yaffs_Device *dev) { - struct yaffs_LinuxContext *ctxt = yaffs_DeviceToLC(dev); + struct yaffs_LinuxContext *ctxt = yaffs_dev_to_lc(dev); ctxt->bgRunning = 0; @@ -2426,17 +2426,17 @@ static void yaffs_BackgroundStop(yaffs_Device *dev) } } #else -static int yaffs_BackgroundThread(void *data) +static int yaffs_bg_thread_fn(void *data) { return 0; } -static int yaffs_BackgroundStart(yaffs_Device *dev) +static int yaffs_bg_start(yaffs_Device *dev) { return 0; } -static void yaffs_BackgroundStop(yaffs_Device *dev) +static void yaffs_bg_stop(yaffs_Device *dev) { } #endif @@ -2501,13 +2501,13 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) * need to lock again. */ - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - obj = yaffs_FindObjectByNumber(dev, inode->i_ino); + obj = yaffs_find_by_number(dev, inode->i_ino); - yaffs_FillInodeFromObject(inode, obj); + yaffs_fill_inode_from_obj(inode, obj); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); unlock_new_inode(inode); return inode; @@ -2528,15 +2528,15 @@ static void yaffs_read_inode(struct inode *inode) T(YAFFS_TRACE_OS, (TSTR("yaffs_read_inode for %d\n"), (int)inode->i_ino)); - if(current != yaffs_DeviceToLC(dev)->readdirProcess) - yaffs_GrossLock(dev); + if(current != yaffs_dev_to_lc(dev)->readdirProcess) + yaffs_gross_lock(dev); - obj = yaffs_FindObjectByNumber(dev, inode->i_ino); + obj = yaffs_find_by_number(dev, inode->i_ino); - yaffs_FillInodeFromObject(inode, obj); + yaffs_fill_inode_from_obj(inode, obj); - if(current != yaffs_DeviceToLC(dev)->readdirProcess) - yaffs_GrossUnlock(dev); + if(current != yaffs_dev_to_lc(dev)->readdirProcess) + yaffs_gross_unlock(dev); } #endif @@ -2552,29 +2552,29 @@ static void yaffs_put_super(struct super_block *sb) T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, (TSTR("Shutting down yaffs background thread\n"))); - yaffs_BackgroundStop(dev); + yaffs_bg_stop(dev); T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, (TSTR("yaffs background thread shut down\n"))); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - yaffs_FlushSuperBlock(sb,1); + yaffs_flush_super(sb,1); - if (yaffs_DeviceToLC(dev)->putSuperFunc) - yaffs_DeviceToLC(dev)->putSuperFunc(sb); + if (yaffs_dev_to_lc(dev)->putSuperFunc) + yaffs_dev_to_lc(dev)->putSuperFunc(sb); - yaffs_Deinitialise(dev); + yaffs_deinitialise(dev); - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); down(&yaffs_context_lock); - ylist_del_init(&(yaffs_DeviceToLC(dev)->contextList)); + ylist_del_init(&(yaffs_dev_to_lc(dev)->contextList)); up(&yaffs_context_lock); - if (yaffs_DeviceToLC(dev)->spareBuffer) { - YFREE(yaffs_DeviceToLC(dev)->spareBuffer); - yaffs_DeviceToLC(dev)->spareBuffer = NULL; + if (yaffs_dev_to_lc(dev)->spareBuffer) { + YFREE(yaffs_dev_to_lc(dev)->spareBuffer); + yaffs_dev_to_lc(dev)->spareBuffer = NULL; } kfree(dev); @@ -2583,7 +2583,7 @@ static void yaffs_put_super(struct super_block *sb) static void yaffs_MTDPutSuper(struct super_block *sb) { - struct mtd_info *mtd = yaffs_DeviceToMtd(yaffs_SuperToDevice(sb)); + struct mtd_info *mtd = yaffs_dev_to_mtd(yaffs_SuperToDevice(sb)); if (mtd->sync) mtd->sync(mtd); @@ -2592,11 +2592,11 @@ static void yaffs_MTDPutSuper(struct super_block *sb) } -static void yaffs_MarkSuperBlockDirty(yaffs_Device *dev) +static void yaffs_touch_super(yaffs_Device *dev) { - struct super_block *sb = yaffs_DeviceToLC(dev)->superBlock; + struct super_block *sb = yaffs_dev_to_lc(dev)->superBlock; - T(YAFFS_TRACE_OS, (TSTR("yaffs_MarkSuperBlockDirty() sb = %p\n"), sb)); + T(YAFFS_TRACE_OS, (TSTR("yaffs_touch_super() sb = %p\n"), sb)); if (sb) sb->s_dirt = 1; } @@ -2965,7 +2965,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, nandmtd2_ReadChunkWithTagsFromNAND; param->markNANDBlockBad = nandmtd2_MarkNANDBlockBad; param->queryNANDBlock = nandmtd2_QueryNANDBlock; - yaffs_DeviceToLC(dev)->spareBuffer = YMALLOC(mtd->oobsize); + yaffs_dev_to_lc(dev)->spareBuffer = YMALLOC(mtd->oobsize); param->isYaffs2 = 1; #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) param->totalBytesPerChunk = mtd->writesize; @@ -2997,12 +2997,12 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, param->eraseBlockInNAND = nandmtd_EraseBlockInNAND; param->initialiseNAND = nandmtd_InitialiseNAND; - yaffs_DeviceToLC(dev)->putSuperFunc = yaffs_MTDPutSuper; + yaffs_dev_to_lc(dev)->putSuperFunc = yaffs_MTDPutSuper; - param->markSuperBlockDirty = yaffs_MarkSuperBlockDirty; + param->markSuperBlockDirty = yaffs_touch_super; param->gcControl = yaffs_gc_control_callback; - yaffs_DeviceToLC(dev)->superBlock= sb; + yaffs_dev_to_lc(dev)->superBlock= sb; #ifndef CONFIG_YAFFS_DOES_ECC @@ -3029,32 +3029,32 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, } context->mount_id = mount_id; - ylist_add_tail(&(yaffs_DeviceToLC(dev)->contextList), &yaffs_context_list); + ylist_add_tail(&(yaffs_dev_to_lc(dev)->contextList), &yaffs_context_list); up(&yaffs_context_lock); /* Directory search handling...*/ - YINIT_LIST_HEAD(&(yaffs_DeviceToLC(dev)->searchContexts)); - param->removeObjectCallback = yaffs_RemoveObjectCallback; + YINIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->searchContexts)); + param->removeObjectCallback = yaffs_remove_obj_callback; - init_MUTEX(&(yaffs_DeviceToLC(dev)->grossLock)); + init_MUTEX(&(yaffs_dev_to_lc(dev)->grossLock)); - yaffs_GrossLock(dev); + yaffs_gross_lock(dev); - err = yaffs_GutsInitialise(dev); + err = yaffs_guts_initialise(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: guts initialised %s\n"), (err == YAFFS_OK) ? "OK" : "FAILED")); if(err == YAFFS_OK) - yaffs_BackgroundStart(dev); + yaffs_bg_start(dev); if(!context->bgThread) param->deferDirectoryUpdate = 0; /* Release lock before yaffs_get_inode() */ - yaffs_GrossUnlock(dev); + yaffs_gross_unlock(dev); /* Create root inode */ if (err == YAFFS_OK) @@ -3380,7 +3380,7 @@ static int yaffs_proc_write_trace_options(struct file *file, const char *buf, int add, len = 0; int pos = 0; - rg = yaffs_traceMask; + rg = yaffs_trace_mask; while (!done && (pos < count)) { done = 1; @@ -3444,9 +3444,9 @@ static int yaffs_proc_write_trace_options(struct file *file, const char *buf, } } - yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS; + yaffs_trace_mask = rg | YAFFS_TRACE_ALWAYS; - printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask); + printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_trace_mask); if (rg & YAFFS_TRACE_ALWAYS) { for (i = 0; mask_flags[i].mask_name != NULL; i++) { diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c index 78cc819..5e2d79a 100644 --- a/yaffs_yaffs1.c +++ b/yaffs_yaffs1.c @@ -18,7 +18,7 @@ #include "yaffs_nand.h" -int yaffs1_Scan(yaffs_Device *dev) +int yaffs1_scan(yaffs_Device *dev) { yaffs_ExtendedTags tags; int blk; @@ -48,21 +48,21 @@ int yaffs1_Scan(yaffs_Device *dev) T(YAFFS_TRACE_SCAN, - (TSTR("yaffs1_Scan starts intstartblk %d intendblk %d..." TENDSTR), + (TSTR("yaffs1_scan starts intstartblk %d intendblk %d..." TENDSTR), dev->internalStartBlock, dev->internalEndBlock)); - chunkData = yaffs_GetTempBuffer(dev, __LINE__); + chunkData = yaffs_get_temp_buffer(dev, __LINE__); dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER; /* Scan all the blocks to determine their state */ bi = dev->blockInfo; for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) { - yaffs_ClearChunkBits(dev, blk); + yaffs_clear_chunk_bits(dev, blk); bi->pagesInUse = 0; bi->softDeletions = 0; - yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber); + yaffs_query_init_block_state(dev, blk, &state, &sequenceNumber); bi->blockState = state; bi->sequenceNumber = sequenceNumber; @@ -99,7 +99,7 @@ int yaffs1_Scan(yaffs_Device *dev) blk = blockIterator; - bi = yaffs_GetBlockInfo(dev, blk); + bi = yaffs_get_block_info(dev, blk); state = bi->blockState; deleted = 0; @@ -110,7 +110,7 @@ int yaffs1_Scan(yaffs_Device *dev) /* Read the tags and decide what to do */ chunk = blk * dev->param.nChunksPerBlock + c; - result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL, + result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL, &tags); /* Let's have a good look at this chunk... */ @@ -151,10 +151,10 @@ int yaffs1_Scan(yaffs_Device *dev) /* chunkId > 0 so it is a data chunk... */ unsigned int endpos; - yaffs_SetChunkBit(dev, blk, c); + yaffs_set_chunk_bit(dev, blk, c); bi->pagesInUse++; - in = yaffs_FindOrCreateObjectByNumber(dev, + in = yaffs_find_or_create_by_number(dev, tags. objectId, YAFFS_OBJECT_TYPE_FILE); @@ -166,7 +166,7 @@ int yaffs1_Scan(yaffs_Device *dev) alloc_failed = 1; if (in) { - if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1)) + if (!yaffs_put_chunk_in_file(in, tags.chunkId, chunk, 1)) alloc_failed = 1; } @@ -192,16 +192,16 @@ int yaffs1_Scan(yaffs_Device *dev) /* chunkId == 0, so it is an ObjectHeader. * Thus, we read in the object header and make the object */ - yaffs_SetChunkBit(dev, blk, c); + yaffs_set_chunk_bit(dev, blk, c); bi->pagesInUse++; - result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, + result = yaffs_rd_chunk_tags_nand(dev, chunk, chunkData, NULL); oh = (yaffs_ObjectHeader *) chunkData; - in = yaffs_FindObjectByNumber(dev, + in = yaffs_find_by_number(dev, tags.objectId); if (in && in->variantType != oh->type) { /* This should not happen, but somehow @@ -209,12 +209,12 @@ int yaffs1_Scan(yaffs_Device *dev) * deleted, and worse still it has changed type. Delete the old object. */ - yaffs_DeleteObject(in); + yaffs_del_obj(in); in = 0; } - in = yaffs_FindOrCreateObjectByNumber(dev, + in = yaffs_find_or_create_by_number(dev, tags. objectId, oh->type); @@ -248,13 +248,13 @@ int yaffs1_Scan(yaffs_Device *dev) if (((existingSerial + 1) & 3) == newSerial) { /* Use new one - destroy the exisiting one */ - yaffs_DeleteChunk(dev, + yaffs_chunk_del(dev, in->hdrChunk, 1, __LINE__); in->valid = 0; } else { /* Use existing - destroy this one. */ - yaffs_DeleteChunk(dev, chunk, 1, + yaffs_chunk_del(dev, chunk, 1, __LINE__); } } @@ -310,7 +310,7 @@ int yaffs1_Scan(yaffs_Device *dev) in->hdrChunk = chunk; in->serial = tags.serialNumber; - yaffs_SetObjectNameFromOH(in, oh); + yaffs_set_obj_name_from_oh(in, oh); in->dirty = 0; /* directory stuff... @@ -318,7 +318,7 @@ int yaffs1_Scan(yaffs_Device *dev) */ parent = - yaffs_FindOrCreateObjectByNumber + yaffs_find_or_create_by_number (dev, oh->parentObjectId, YAFFS_OBJECT_TYPE_DIRECTORY); if (!parent) @@ -344,7 +344,7 @@ int yaffs1_Scan(yaffs_Device *dev) parent = dev->lostNFoundDir; } - yaffs_AddObjectToDirectory(parent, in); + yaffs_add_obj_to_dir(parent, in); if (0 && (parent == dev->deletedDir || parent == dev->unlinkedDir)) { @@ -387,7 +387,7 @@ int yaffs1_Scan(yaffs_Device *dev) break; case YAFFS_OBJECT_TYPE_SYMLINK: in->variant.symLinkVariant.alias = - yaffs_CloneString(oh->alias); + yaffs_clone_str(oh->alias); if (!in->variant.symLinkVariant.alias) alloc_failed = 1; break; @@ -414,7 +414,7 @@ int yaffs1_Scan(yaffs_Device *dev) if (bi->pagesInUse == 0 && !bi->hasShrinkHeader && bi->blockState == YAFFS_BLOCK_STATE_FULL) { - yaffs_BlockBecameDirty(dev, blk); + yaffs_block_became_dirty(dev, blk); } } @@ -426,7 +426,7 @@ int yaffs1_Scan(yaffs_Device *dev) * hardlinks. */ - yaffs_HardlinkFixup(dev, hardList); + yaffs_link_fixup(dev, hardList); /* Fix up any shadowed objects */ { @@ -439,25 +439,25 @@ int yaffs1_Scan(yaffs_Device *dev) /* Complete the rename transaction by deleting the shadowed object * then setting the object header to unshadowed. */ - obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId); + obj = yaffs_find_by_number(dev, fixer->shadowedId); if (obj) - yaffs_DeleteObject(obj); + yaffs_del_obj(obj); - obj = yaffs_FindObjectByNumber(dev, fixer->objectId); + obj = yaffs_find_by_number(dev, fixer->objectId); if (obj) - yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0, NULL); + yaffs_update_oh(obj, NULL, 1, 0, 0, NULL); YFREE(fixer); } } - yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__); + yaffs_release_temp_buffer(dev, chunkData, __LINE__); if (alloc_failed) return YAFFS_FAIL; - T(YAFFS_TRACE_SCAN, (TSTR("yaffs1_Scan ends" TENDSTR))); + T(YAFFS_TRACE_SCAN, (TSTR("yaffs1_scan ends" TENDSTR))); return YAFFS_OK; diff --git a/yaffs_yaffs1.h b/yaffs_yaffs1.h index 9769eed..20c190f 100644 --- a/yaffs_yaffs1.h +++ b/yaffs_yaffs1.h @@ -17,6 +17,6 @@ #define __YAFFS_YAFFS1_H__ #include "yaffs_guts.h" -int yaffs1_Scan(yaffs_Device *dev); +int yaffs1_scan(yaffs_Device *dev); #endif diff --git a/yaffs_yaffs2.c b/yaffs_yaffs2.c index e13dd41..7d177b7 100644 --- a/yaffs_yaffs2.c +++ b/yaffs_yaffs2.c @@ -37,11 +37,11 @@ * Oldest Dirty Sequence Number handling. */ -/* yaffs2_CalcOldestDirtySequence() - * yaffs2_FindOldestDirtySequence() +/* yaffs_calc_oldest_dirty_seq() + * yaffs2_find_oldest_dirty_seq() * Calculate the oldest dirty sequence number if we don't know it. */ -void yaffs2_CalcOldestDirtySequence(yaffs_Device *dev) +void yaffs_calc_oldest_dirty_seq(yaffs_Device *dev) { int i; unsigned seq; @@ -72,22 +72,22 @@ void yaffs2_CalcOldestDirtySequence(yaffs_Device *dev) } -void yaffs2_FindOldestDirtySequence(yaffs_Device *dev) +void yaffs2_find_oldest_dirty_seq(yaffs_Device *dev) { if(!dev->param.isYaffs2) return; if(!dev->oldestDirtySequence) - yaffs2_CalcOldestDirtySequence(dev); + yaffs_calc_oldest_dirty_seq(dev); } /* - * yaffs_ClearOldestDirtySequence() + * yaffs_clear_oldest_dirty_seq() * Called when a block is erased or marked bad. (ie. when its sequenceNumber * becomes invalid). If the value matches the oldest then we clear * dev->oldestDirtySequence to force its recomputation. */ -void yaffs2_ClearOldestDirtySequence(yaffs_Device *dev, yaffs_BlockInfo *bi) +void yaffs2_clear_oldest_dirty_seq(yaffs_Device *dev, yaffs_BlockInfo *bi) { if(!dev->param.isYaffs2) @@ -100,11 +100,11 @@ void yaffs2_ClearOldestDirtySequence(yaffs_Device *dev, yaffs_BlockInfo *bi) } /* - * yaffs2_UpdateOldestDirtySequence() + * yaffs2_update_oldest_dirty_seq() * Update the oldest dirty sequence number whenever we dirty a block. * Only do this if the oldestDirtySequence is actually being tracked. */ -void yaffs2_UpdateOldestDirtySequence(yaffs_Device *dev, unsigned blockNo, yaffs_BlockInfo *bi) +void yaffs2_update_oldest_dirty_seq(yaffs_Device *dev, unsigned blockNo, yaffs_BlockInfo *bi) { if(!dev->param.isYaffs2) return; @@ -117,7 +117,7 @@ void yaffs2_UpdateOldestDirtySequence(yaffs_Device *dev, unsigned blockNo, yaffs } } -int yaffs2_BlockNotDisqualifiedFromGC(yaffs_Device *dev, +int yaffs_block_ok_for_gc(yaffs_Device *dev, yaffs_BlockInfo *bi) { @@ -127,7 +127,7 @@ int yaffs2_BlockNotDisqualifiedFromGC(yaffs_Device *dev, if (!bi->hasShrinkHeader) return 1; /* can gc */ - yaffs2_FindOldestDirtySequence(dev); + yaffs2_find_oldest_dirty_seq(dev); /* Can't do gc of this block if there are any blocks older than this one that have * discarded pages. @@ -136,11 +136,11 @@ int yaffs2_BlockNotDisqualifiedFromGC(yaffs_Device *dev, } /* - * yaffs2_FindRefreshBlock() + * yaffs2_find_refresh_block() * periodically finds the oldest full block by sequence number for refreshing. * Only for yaffs2. */ -__u32 yaffs2_FindRefreshBlock(yaffs_Device *dev) +__u32 yaffs2_find_refresh_block(yaffs_Device *dev) { __u32 b ; @@ -197,7 +197,7 @@ __u32 yaffs2_FindRefreshBlock(yaffs_Device *dev) return oldest; } -int yaffs2_CheckpointRequired(yaffs_Device *dev) +int yaffs2_checkpt_required(yaffs_Device *dev) { int nblocks; @@ -211,7 +211,7 @@ int yaffs2_CheckpointRequired(yaffs_Device *dev) (nblocks >= YAFFS_CHECKPOINT_MIN_BLOCKS); } -int yaffs2_CalcCheckpointBlocksRequired(yaffs_Device *dev) +int yaffs_calc_checkpt_blocks_required(yaffs_Device *dev) { int retval; @@ -219,7 +219,7 @@ int yaffs2_CalcCheckpointBlocksRequired(yaffs_Device *dev) return 0; if (!dev->nCheckpointBlocksRequired && - yaffs2_CheckpointRequired(dev)){ + yaffs2_checkpt_required(dev)){ /* Not a valid value so recalculate */ int nBytes = 0; int nBlocks; @@ -250,7 +250,7 @@ int yaffs2_CalcCheckpointBlocksRequired(yaffs_Device *dev) /*--------------------- Checkpointing --------------------*/ -static int yaffs2_WriteCheckpointValidityMarker(yaffs_Device *dev, int head) +static int yaffs2_wr_checkpt_validity_marker(yaffs_Device *dev, int head) { yaffs_CheckpointValidity cp; @@ -261,16 +261,16 @@ static int yaffs2_WriteCheckpointValidityMarker(yaffs_Device *dev, int head) cp.version = YAFFS_CHECKPOINT_VERSION; cp.head = (head) ? 1 : 0; - return (yaffs2_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ? + return (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)) ? 1 : 0; } -static int yaffs2_ReadCheckpointValidityMarker(yaffs_Device *dev, int head) +static int yaffs2_rd_checkpt_validty_marker(yaffs_Device *dev, int head) { yaffs_CheckpointValidity cp; int ok; - ok = (yaffs2_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp)); + ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp)); if (ok) ok = (cp.structType == sizeof(cp)) && @@ -280,7 +280,7 @@ static int yaffs2_ReadCheckpointValidityMarker(yaffs_Device *dev, int head) return ok ? 1 : 0; } -static void yaffs2_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp, +static void yaffs2_dev_to_checkpt_dev(yaffs_CheckpointDevice *cp, yaffs_Device *dev) { cp->nErasedBlocks = dev->nErasedBlocks; @@ -295,7 +295,7 @@ static void yaffs2_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp, } -static void yaffs2_CheckpointDeviceToDevice(yaffs_Device *dev, +static void yaffs_checkpt_dev_to_dev(yaffs_Device *dev, yaffs_CheckpointDevice *cp) { dev->nErasedBlocks = cp->nErasedBlocks; @@ -310,7 +310,7 @@ static void yaffs2_CheckpointDeviceToDevice(yaffs_Device *dev, } -static int yaffs2_WriteCheckpointDevice(yaffs_Device *dev) +static int yaffs2_wr_checkpt_dev(yaffs_Device *dev) { yaffs_CheckpointDevice cp; __u32 nBytes; @@ -319,27 +319,27 @@ static int yaffs2_WriteCheckpointDevice(yaffs_Device *dev) int ok; /* Write device runtime values*/ - yaffs2_DeviceToCheckpointDevice(&cp, dev); + yaffs2_dev_to_checkpt_dev(&cp, dev); cp.structType = sizeof(cp); - ok = (yaffs2_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)); + ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)); /* Write block info */ if (ok) { nBytes = nBlocks * sizeof(yaffs_BlockInfo); - ok = (yaffs2_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes); + ok = (yaffs2_checkpt_wr(dev, dev->blockInfo, nBytes) == nBytes); } /* Write chunk bits */ if (ok) { nBytes = nBlocks * dev->chunkBitmapStride; - ok = (yaffs2_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes); + ok = (yaffs2_checkpt_wr(dev, dev->chunkBits, nBytes) == nBytes); } return ok ? 1 : 0; } -static int yaffs2_ReadCheckpointDevice(yaffs_Device *dev) +static int yaffs2_rd_checkpt_dev(yaffs_Device *dev) { yaffs_CheckpointDevice cp; __u32 nBytes; @@ -347,7 +347,7 @@ static int yaffs2_ReadCheckpointDevice(yaffs_Device *dev) int ok; - ok = (yaffs2_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp)); + ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp)); if (!ok) return 0; @@ -355,22 +355,22 @@ static int yaffs2_ReadCheckpointDevice(yaffs_Device *dev) return 0; - yaffs2_CheckpointDeviceToDevice(dev, &cp); + yaffs_checkpt_dev_to_dev(dev, &cp); nBytes = nBlocks * sizeof(yaffs_BlockInfo); - ok = (yaffs2_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes); + ok = (yaffs2_checkpt_rd(dev, dev->blockInfo, nBytes) == nBytes); if (!ok) return 0; nBytes = nBlocks * dev->chunkBitmapStride; - ok = (yaffs2_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes); + ok = (yaffs2_checkpt_rd(dev, dev->chunkBits, nBytes) == nBytes); return ok ? 1 : 0; } -static void yaffs2_ObjectToCheckpointObject(yaffs_CheckpointObject *cp, +static void yaffs2_obj_checkpt_obj(yaffs_CheckpointObject *cp, yaffs_Object *obj) { @@ -393,7 +393,7 @@ static void yaffs2_ObjectToCheckpointObject(yaffs_CheckpointObject *cp, cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId; } -static int yaffs2_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp) +static int taffs2_checkpt_obj_to_obj(yaffs_Object *obj, yaffs_CheckpointObject *cp) { yaffs_Object *parent; @@ -409,7 +409,7 @@ static int yaffs2_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointOb obj->objectId = cp->objectId; if (cp->parentId) - parent = yaffs_FindOrCreateObjectByNumber( + parent = yaffs_find_or_create_by_number( obj->myDev, cp->parentId, YAFFS_OBJECT_TYPE_DIRECTORY); @@ -425,7 +425,7 @@ static int yaffs2_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointOb cp->hdrChunk, parent->variantType)); return 0; } - yaffs_AddObjectToDirectory(parent, obj); + yaffs_add_obj_to_dir(parent, obj); } obj->hdrChunk = cp->hdrChunk; @@ -451,7 +451,7 @@ static int yaffs2_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointOb -static int yaffs2_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn, +static int yaffs2_checkpt_tnode_worker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset) { int i; @@ -463,7 +463,7 @@ static int yaffs2_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn, for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) { if (tn->internal[i]) { - ok = yaffs2_CheckpointTnodeWorker(in, + ok = yaffs2_checkpt_tnode_worker(in, tn->internal[i], level - 1, (chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i); @@ -471,9 +471,9 @@ static int yaffs2_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn, } } else if (level == 0) { __u32 baseOffset = chunkOffset << YAFFS_TNODES_LEVEL0_BITS; - ok = (yaffs2_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset)); + ok = (yaffs2_checkpt_wr(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset)); if (ok) - ok = (yaffs2_CheckpointWrite(dev, tn, dev->tnodeSize) == dev->tnodeSize); + ok = (yaffs2_checkpt_wr(dev, tn, dev->tnodeSize) == dev->tnodeSize); } } @@ -481,25 +481,25 @@ static int yaffs2_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn, } -static int yaffs2_WriteCheckpointTnodes(yaffs_Object *obj) +static int yaffs2_wr_checkpt_tnodes(yaffs_Object *obj) { __u32 endMarker = ~0; int ok = 1; if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) { - ok = yaffs2_CheckpointTnodeWorker(obj, + ok = yaffs2_checkpt_tnode_worker(obj, obj->variant.fileVariant.top, obj->variant.fileVariant.topLevel, 0); if (ok) - ok = (yaffs2_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) == + ok = (yaffs2_checkpt_wr(obj->myDev, &endMarker, sizeof(endMarker)) == sizeof(endMarker)); } return ok ? 1 : 0; } -static int yaffs2_ReadCheckpointTnodes(yaffs_Object *obj) +static int yaffs2_rd_checkpt_tnodes(yaffs_Object *obj) { __u32 baseChunk; int ok = 1; @@ -508,27 +508,27 @@ static int yaffs2_ReadCheckpointTnodes(yaffs_Object *obj) yaffs_Tnode *tn; int nread = 0; - ok = (yaffs2_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk)); + ok = (yaffs2_checkpt_rd(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk)); while (ok && (~baseChunk)) { nread++; /* Read level 0 tnode */ - tn = yaffs_GetTnode(dev); + tn = yaffs_get_tnode(dev); if (tn){ - ok = (yaffs2_CheckpointRead(dev, tn, dev->tnodeSize) == dev->tnodeSize); + ok = (yaffs2_checkpt_rd(dev, tn, dev->tnodeSize) == dev->tnodeSize); } else ok = 0; if (tn && ok) - ok = yaffs_AddOrFindLevel0Tnode(dev, + ok = yaffs_add_find_tnode_0(dev, fileStructPtr, baseChunk, tn) ? 1 : 0; if (ok) - ok = (yaffs2_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk)); + ok = (yaffs2_checkpt_rd(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk)); } @@ -540,7 +540,7 @@ static int yaffs2_ReadCheckpointTnodes(yaffs_Object *obj) } -static int yaffs2_WriteCheckpointObjects(yaffs_Device *dev) +static int yaffs2_wr_checkpt_objs(yaffs_Device *dev) { yaffs_Object *obj; yaffs_CheckpointObject cp; @@ -558,17 +558,17 @@ static int yaffs2_WriteCheckpointObjects(yaffs_Device *dev) if (lh) { obj = ylist_entry(lh, yaffs_Object, hashLink); if (!obj->deferedFree) { - yaffs2_ObjectToCheckpointObject(&cp, obj); + yaffs2_obj_checkpt_obj(&cp, obj); cp.structType = sizeof(cp); T(YAFFS_TRACE_CHECKPOINT, ( TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %p" TENDSTR), cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, obj)); - ok = (yaffs2_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)); + ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)); if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE) - ok = yaffs2_WriteCheckpointTnodes(obj); + ok = yaffs2_wr_checkpt_tnodes(obj); } } } @@ -579,12 +579,12 @@ static int yaffs2_WriteCheckpointObjects(yaffs_Device *dev) cp.structType = sizeof(cp); if (ok) - ok = (yaffs2_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)); + ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)); return ok ? 1 : 0; } -static int yaffs2_ReadCheckpointObjects(yaffs_Device *dev) +static int yaffs2_rd_checkpt_objs(yaffs_Device *dev) { yaffs_Object *obj; yaffs_CheckpointObject cp; @@ -593,7 +593,7 @@ static int yaffs2_ReadCheckpointObjects(yaffs_Device *dev) yaffs_Object *hardList = NULL; while (ok && !done) { - ok = (yaffs2_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp)); + ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp)); if (cp.structType != sizeof(cp)) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR), cp.structType, (int)sizeof(cp), ok)); @@ -606,13 +606,13 @@ static int yaffs2_ReadCheckpointObjects(yaffs_Device *dev) if (ok && cp.objectId == ~0) done = 1; else if (ok) { - obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType); + obj = yaffs_find_or_create_by_number(dev, cp.objectId, cp.variantType); if (obj) { - ok = yaffs2_CheckpointObjectToObject(obj, &cp); + ok = taffs2_checkpt_obj_to_obj(obj, &cp); if (!ok) break; if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) { - ok = yaffs2_ReadCheckpointTnodes(obj); + ok = yaffs2_rd_checkpt_tnodes(obj); } else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { obj->hardLinks.next = (struct ylist_head *) hardList; @@ -624,19 +624,19 @@ static int yaffs2_ReadCheckpointObjects(yaffs_Device *dev) } if (ok) - yaffs_HardlinkFixup(dev, hardList); + yaffs_link_fixup(dev, hardList); return ok ? 1 : 0; } -static int yaffs2_WriteCheckpointSum(yaffs_Device *dev) +static int yaffs2_wr_checkpt_sum(yaffs_Device *dev) { __u32 checkpointSum; int ok; - yaffs2_GetCheckpointSum(dev, &checkpointSum); + yaffs2_get_checkpt_sum(dev, &checkpointSum); - ok = (yaffs2_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum)); + ok = (yaffs2_checkpt_wr(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum)); if (!ok) return 0; @@ -644,15 +644,15 @@ static int yaffs2_WriteCheckpointSum(yaffs_Device *dev) return 1; } -static int yaffs2_ReadCheckpointSum(yaffs_Device *dev) +static int yaffs2_rd_checkpt_sum(yaffs_Device *dev) { __u32 checkpointSum0; __u32 checkpointSum1; int ok; - yaffs2_GetCheckpointSum(dev, &checkpointSum0); + yaffs2_get_checkpt_sum(dev, &checkpointSum0); - ok = (yaffs2_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1)); + ok = (yaffs2_checkpt_rd(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1)); if (!ok) return 0; @@ -664,39 +664,39 @@ static int yaffs2_ReadCheckpointSum(yaffs_Device *dev) } -static int yaffs2_WriteCheckpointData(yaffs_Device *dev) +static int yaffs2_wr_checkpt_data(yaffs_Device *dev) { int ok = 1; - if (!yaffs2_CheckpointRequired(dev)) { + if (!yaffs2_checkpt_required(dev)) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR))); ok = 0; } if (ok) - ok = yaffs2_CheckpointOpen(dev, 1); + ok = yaffs2_checkpt_open(dev, 1); if (ok) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR))); - ok = yaffs2_WriteCheckpointValidityMarker(dev, 1); + ok = yaffs2_wr_checkpt_validity_marker(dev, 1); } if (ok) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR))); - ok = yaffs2_WriteCheckpointDevice(dev); + ok = yaffs2_wr_checkpt_dev(dev); } if (ok) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR))); - ok = yaffs2_WriteCheckpointObjects(dev); + ok = yaffs2_wr_checkpt_objs(dev); } if (ok) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR))); - ok = yaffs2_WriteCheckpointValidityMarker(dev, 0); + ok = yaffs2_wr_checkpt_validity_marker(dev, 0); } if (ok) - ok = yaffs2_WriteCheckpointSum(dev); + ok = yaffs2_wr_checkpt_sum(dev); - if (!yaffs2_CheckpointClose(dev)) + if (!yaffs_checkpt_close(dev)) ok = 0; if (ok) @@ -707,7 +707,7 @@ static int yaffs2_WriteCheckpointData(yaffs_Device *dev) return dev->isCheckpointed; } -static int yaffs2_ReadCheckpointData(yaffs_Device *dev) +static int yaffs2_rd_checkpt_data(yaffs_Device *dev) { int ok = 1; @@ -720,31 +720,31 @@ static int yaffs2_ReadCheckpointData(yaffs_Device *dev) } if (ok) - ok = yaffs2_CheckpointOpen(dev, 0); /* open for read */ + ok = yaffs2_checkpt_open(dev, 0); /* open for read */ if (ok) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR))); - ok = yaffs2_ReadCheckpointValidityMarker(dev, 1); + ok = yaffs2_rd_checkpt_validty_marker(dev, 1); } if (ok) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR))); - ok = yaffs2_ReadCheckpointDevice(dev); + ok = yaffs2_rd_checkpt_dev(dev); } if (ok) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR))); - ok = yaffs2_ReadCheckpointObjects(dev); + ok = yaffs2_rd_checkpt_objs(dev); } if (ok) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR))); - ok = yaffs2_ReadCheckpointValidityMarker(dev, 0); + ok = yaffs2_rd_checkpt_validty_marker(dev, 0); } if (ok) { - ok = yaffs2_ReadCheckpointSum(dev); + ok = yaffs2_rd_checkpt_sum(dev); T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok)); } - if (!yaffs2_CheckpointClose(dev)) + if (!yaffs_checkpt_close(dev)) ok = 0; if (ok) @@ -756,30 +756,30 @@ static int yaffs2_ReadCheckpointData(yaffs_Device *dev) } -void yaffs2_InvalidateCheckpoint(yaffs_Device *dev) +void yaffs2_checkpt_invalidate(yaffs_Device *dev) { if (dev->isCheckpointed || dev->blocksInCheckpoint > 0) { dev->isCheckpointed = 0; - yaffs2_CheckpointInvalidateStream(dev); + yaffs2_checkpt_invalidate_stream(dev); } if (dev->param.markSuperBlockDirty) dev->param.markSuperBlockDirty(dev); } -int yaffs_CheckpointSave(yaffs_Device *dev) +int yaffs_checkpoint_save(yaffs_Device *dev) { T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed)); - yaffs_VerifyObjects(dev); - yaffs_VerifyBlocks(dev); - yaffs_VerifyFreeChunks(dev); + yaffs_verify_objects(dev); + yaffs_verify_blocks(dev); + yaffs_verify_free_chunks(dev); if (!dev->isCheckpointed) { - yaffs2_InvalidateCheckpoint(dev); - yaffs2_WriteCheckpointData(dev); + yaffs2_checkpt_invalidate(dev); + yaffs2_wr_checkpt_data(dev); } T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed)); @@ -787,17 +787,17 @@ int yaffs_CheckpointSave(yaffs_Device *dev) return dev->isCheckpointed; } -int yaffs2_CheckpointRestore(yaffs_Device *dev) +int yaffs2_checkpt_restore(yaffs_Device *dev) { int retval; T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed)); - retval = yaffs2_ReadCheckpointData(dev); + retval = yaffs2_rd_checkpt_data(dev); if (dev->isCheckpointed) { - yaffs_VerifyObjects(dev); - yaffs_VerifyBlocks(dev); - yaffs_VerifyFreeChunks(dev); + yaffs_verify_objects(dev); + yaffs_verify_blocks(dev); + yaffs_verify_free_chunks(dev); } T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed)); @@ -805,7 +805,7 @@ int yaffs2_CheckpointRestore(yaffs_Device *dev) return retval; } -int yaffs2_HandleHole(yaffs_Object *obj, loff_t newSize) +int yaffs2_handle_hole(yaffs_Object *obj, loff_t newSize) { /* if newsSize > oldFileSize. * We're going to be writing a hole. @@ -843,13 +843,13 @@ int yaffs2_HandleHole(yaffs_Object *obj, loff_t newSize) increase = newSize - oldFileSize; if(increase < YAFFS_SMALL_HOLE_THRESHOLD * dev->nDataBytesPerChunk && - yaffs_CheckSpaceForAllocation(dev, YAFFS_SMALL_HOLE_THRESHOLD + 1)) + yaffs_check_alloc_available(dev, YAFFS_SMALL_HOLE_THRESHOLD + 1)) smallHole = 1; else smallHole = 0; if(smallHole) - localBuffer= yaffs_GetTempBuffer(dev, __LINE__); + localBuffer= yaffs_get_temp_buffer(dev, __LINE__); if(localBuffer){ /* fill hole with zero bytes */ @@ -863,7 +863,7 @@ int yaffs2_HandleHole(yaffs_Object *obj, loff_t newSize) thisWrite = increase; if(thisWrite > dev->nDataBytesPerChunk) thisWrite = dev->nDataBytesPerChunk; - written = yaffs_DoWriteDataToFile(obj,localBuffer,pos,thisWrite,0); + written = yaffs_do_file_wr(obj,localBuffer,pos,thisWrite,0); if(written == thisWrite){ pos += thisWrite; increase -= thisWrite; @@ -871,11 +871,11 @@ int yaffs2_HandleHole(yaffs_Object *obj, loff_t newSize) smallIncreaseOk = 0; } - yaffs_ReleaseTempBuffer(dev,localBuffer,__LINE__); + yaffs_release_temp_buffer(dev,localBuffer,__LINE__); /* If we were out of space then reverse any chunks we've added */ if(!smallIncreaseOk) - yaffs_ResizeDown(obj, oldFileSize); + yaffs_resize_file_down(obj, oldFileSize); } if (!smallIncreaseOk && @@ -883,7 +883,7 @@ int yaffs2_HandleHole(yaffs_Object *obj, loff_t newSize) obj->parent->objectId != YAFFS_OBJECTID_UNLINKED && obj->parent->objectId != YAFFS_OBJECTID_DELETED){ /* Write a hole start header with the old file size */ - yaffs_UpdateObjectHeader(obj, NULL, 0, 1, 0, NULL); + yaffs_update_oh(obj, NULL, 0, 1, 0, NULL); } return result; @@ -909,7 +909,7 @@ static int yaffs2_ybicmp(const void *a, const void *b) return aseq - bseq; } -int yaffs2_ScanBackwards(yaffs_Device *dev) +int yaffs2_scan_backwards(yaffs_Device *dev) { yaffs_ExtendedTags tags; int blk; @@ -945,7 +945,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) T(YAFFS_TRACE_SCAN, (TSTR - ("yaffs2_ScanBackwards starts intstartblk %d intendblk %d..." + ("yaffs2_scan_backwards starts intstartblk %d intendblk %d..." TENDSTR), dev->internalStartBlock, dev->internalEndBlock)); @@ -960,22 +960,22 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) if (!blockIndex) { T(YAFFS_TRACE_SCAN, - (TSTR("yaffs2_ScanBackwards() could not allocate block index!" TENDSTR))); + (TSTR("yaffs2_scan_backwards() could not allocate block index!" TENDSTR))); return YAFFS_FAIL; } dev->blocksInCheckpoint = 0; - chunkData = yaffs_GetTempBuffer(dev, __LINE__); + chunkData = yaffs_get_temp_buffer(dev, __LINE__); /* Scan all the blocks to determine their state */ bi = dev->blockInfo; for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) { - yaffs_ClearChunkBits(dev, blk); + yaffs_clear_chunk_bits(dev, blk); bi->pagesInUse = 0; bi->softDeletions = 0; - yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber); + yaffs_query_init_block_state(dev, blk, &state, &sequenceNumber); bi->blockState = state; bi->sequenceNumber = sequenceNumber; @@ -1056,7 +1056,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) /* get the block to scan in the correct order */ blk = blockIndex[blockIterator].block; - bi = yaffs_GetBlockInfo(dev, blk); + bi = yaffs_get_block_info(dev, blk); state = bi->blockState; @@ -1075,7 +1075,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) chunk = blk * dev->param.nChunksPerBlock + c; - result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL, + result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL, &tags); /* Let's have a good look at this chunk... */ @@ -1151,10 +1151,10 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) foundChunksInBlock = 1; - yaffs_SetChunkBit(dev, blk, c); + yaffs_set_chunk_bit(dev, blk, c); bi->pagesInUse++; - in = yaffs_FindOrCreateObjectByNumber(dev, + in = yaffs_find_or_create_by_number(dev, tags. objectId, YAFFS_OBJECT_TYPE_FILE); @@ -1167,7 +1167,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) in->variantType == YAFFS_OBJECT_TYPE_FILE && chunkBase < in->variant.fileVariant.shrinkSize) { /* This has not been invalidated by a resize */ - if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, -1)) { + if (!yaffs_put_chunk_in_file(in, tags.chunkId, chunk, -1)) { alloc_failed = 1; } @@ -1185,7 +1185,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) } else if (in) { /* This chunk has been invalidated by a resize, or a past file deletion * so delete the chunk*/ - yaffs_DeleteChunk(dev, chunk, 1, __LINE__); + yaffs_chunk_del(dev, chunk, 1, __LINE__); } } else { @@ -1194,14 +1194,14 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) */ foundChunksInBlock = 1; - yaffs_SetChunkBit(dev, blk, c); + yaffs_set_chunk_bit(dev, blk, c); bi->pagesInUse++; oh = NULL; in = NULL; if (tags.extraHeaderInfoAvailable) { - in = yaffs_FindOrCreateObjectByNumber(dev, + in = yaffs_find_or_create_by_number(dev, tags.objectId, tags.extraObjectType); if (!in) @@ -1220,7 +1220,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) * living with invalid data until needed. */ - result = yaffs_ReadChunkWithTagsFromNAND(dev, + result = yaffs_rd_chunk_tags_nand(dev, chunk, chunkData, NULL); @@ -1234,7 +1234,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) } if (!in) { - in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type); + in = yaffs_find_or_create_by_number(dev, tags.objectId, oh->type); if (!in) alloc_failed = 1; } @@ -1293,7 +1293,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) } /* Use existing - destroy this one. */ - yaffs_DeleteChunk(dev, chunk, 1, __LINE__); + yaffs_chunk_del(dev, chunk, 1, __LINE__); } @@ -1368,16 +1368,16 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) #endif if (oh->shadowsObject > 0) - yaffs_HandleShadowedObject(dev, + yaffs_handle_shadowed_obj(dev, oh-> shadowsObject, 1); - yaffs_SetObjectNameFromOH(in, oh); + yaffs_set_obj_name_from_oh(in, oh); parent = - yaffs_FindOrCreateObjectByNumber + yaffs_find_or_create_by_number (dev, oh->parentObjectId, YAFFS_OBJECT_TYPE_DIRECTORY); @@ -1388,7 +1388,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) } else { in->variantType = tags.extraObjectType; parent = - yaffs_FindOrCreateObjectByNumber + yaffs_find_or_create_by_number (dev, tags.extraParentObjectId, YAFFS_OBJECT_TYPE_DIRECTORY); fileSize = tags.extraFileLength; @@ -1427,7 +1427,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) parent = dev->lostNFoundDir; } - yaffs_AddObjectToDirectory(parent, in); + yaffs_add_obj_to_dir(parent, in); itsUnlinked = (parent == dev->deletedDir) || (parent == dev->unlinkedDir); @@ -1484,7 +1484,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) case YAFFS_OBJECT_TYPE_SYMLINK: if (oh) { in->variant.symLinkVariant.alias = - yaffs_CloneString(oh->alias); + yaffs_clone_str(oh->alias); if (!in->variant.symLinkVariant.alias) alloc_failed = 1; } @@ -1509,12 +1509,12 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) if (bi->pagesInUse == 0 && !bi->hasShrinkHeader && bi->blockState == YAFFS_BLOCK_STATE_FULL) { - yaffs_BlockBecameDirty(dev, blk); + yaffs_block_became_dirty(dev, blk); } } - yaffs_SkipRestOfBlock(dev); + yaffs_skip_rest_of_block(dev); if (altBlockIndex) YFREE_ALT(blockIndex); @@ -1526,15 +1526,15 @@ int yaffs2_ScanBackwards(yaffs_Device *dev) * We should now have scanned all the objects, now it's time to add these * hardlinks. */ - yaffs_HardlinkFixup(dev, hardList); + yaffs_link_fixup(dev, hardList); - yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__); + yaffs_release_temp_buffer(dev, chunkData, __LINE__); if (alloc_failed) return YAFFS_FAIL; - T(YAFFS_TRACE_SCAN, (TSTR("yaffs2_ScanBackwards ends" TENDSTR))); + T(YAFFS_TRACE_SCAN, (TSTR("yaffs2_scan_backwards ends" TENDSTR))); return YAFFS_OK; } diff --git a/yaffs_yaffs2.h b/yaffs_yaffs2.h index 67dc8f1..e54bc6c 100644 --- a/yaffs_yaffs2.h +++ b/yaffs_yaffs2.h @@ -16,21 +16,21 @@ #include "yaffs_guts.h" -void yaffs2_CalcOldestDirtySequence(yaffs_Device *dev); -void yaffs2_FindOldestDirtySequence(yaffs_Device *dev); -void yaffs2_ClearOldestDirtySequence(yaffs_Device *dev, yaffs_BlockInfo *bi); -void yaffs2_UpdateOldestDirtySequence(yaffs_Device *dev, unsigned blockNo, yaffs_BlockInfo *bi); -int yaffs2_BlockNotDisqualifiedFromGC(yaffs_Device *dev, yaffs_BlockInfo *bi); -__u32 yaffs2_FindRefreshBlock(yaffs_Device *dev); -int yaffs2_CheckpointRequired(yaffs_Device *dev); -int yaffs2_CalcCheckpointBlocksRequired(yaffs_Device *dev); +void yaffs_calc_oldest_dirty_seq(yaffs_Device *dev); +void yaffs2_find_oldest_dirty_seq(yaffs_Device *dev); +void yaffs2_clear_oldest_dirty_seq(yaffs_Device *dev, yaffs_BlockInfo *bi); +void yaffs2_update_oldest_dirty_seq(yaffs_Device *dev, unsigned blockNo, yaffs_BlockInfo *bi); +int yaffs_block_ok_for_gc(yaffs_Device *dev, yaffs_BlockInfo *bi); +__u32 yaffs2_find_refresh_block(yaffs_Device *dev); +int yaffs2_checkpt_required(yaffs_Device *dev); +int yaffs_calc_checkpt_blocks_required(yaffs_Device *dev); -void yaffs2_InvalidateCheckpoint(yaffs_Device *dev); -int yaffs2_CheckpointSave(yaffs_Device *dev); -int yaffs2_CheckpointRestore(yaffs_Device *dev); +void yaffs2_checkpt_invalidate(yaffs_Device *dev); +int yaffs2_checkpt_save(yaffs_Device *dev); +int yaffs2_checkpt_restore(yaffs_Device *dev); -int yaffs2_HandleHole(yaffs_Object *obj, loff_t newSize); -int yaffs2_ScanBackwards(yaffs_Device *dev); +int yaffs2_handle_hole(yaffs_Object *obj, loff_t newSize); +int yaffs2_scan_backwards(yaffs_Device *dev); #endif diff --git a/yaffsinterface.h b/yaffsinterface.h index ca36cfc..62694d8 100644 --- a/yaffsinterface.h +++ b/yaffsinterface.h @@ -16,6 +16,6 @@ #ifndef __YAFFSINTERFACE_H__ #define __YAFFSINTERFACE_H__ -int yaffs_Initialise(unsigned nBlocks); +int yaffs_initialise(unsigned nBlocks); #endif @@ -87,7 +87,7 @@ #define Y_TIME_CONVERT(x) (x) #endif -#define yaffs_SumCompare(x, y) ((x) == (y)) +#define yaffs_sum_cmp(x, y) ((x) == (y)) #define yaffs_strcmp(a, b) strcmp(a, b) #define TENDSTR "\n" @@ -145,7 +145,7 @@ #define YAFFS_ROOT_MODE 0755 #define YAFFS_LOSTNFOUND_MODE 0700 -#define yaffs_SumCompare(x, y) ((x) == (y)) +#define yaffs_sum_cmp(x, y) ((x) == (y)) #define yaffs_strcmp(a, b) strcmp(a, b) #else |