X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs_multi.c;h=e1438dab2d94e839500585d4317b1fe9701fafb4;hp=a24e61f0fae96ee66fc0dfdcc0a205eacd6e1b78;hb=976dbeae825b18e6759f3903073a6784248cc244;hpb=70c6bf2ff57c8a2fb778accdd5b4227abf273674 diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c index a24e61f..e1438da 100644 --- a/yaffs_vfs_multi.c +++ b/yaffs_vfs_multi.c @@ -24,11 +24,11 @@ * the VFS. * * Special notes: - * >> 2.4: sb->u.generic_sbp points to the yaffs_Device associated with + * >> 2.4: sb->u.generic_sbp points to the struct yaffs_dev associated with * this superblock - * >> 2.6: sb->s_fs_info points to the yaffs_Device associated with this + * >> 2.6: sb->s_fs_info points to the struct yaffs_dev associated with this * superblock - * >> inode->u.generic_ip points to the associated yaffs_Object. + * >> inode->u.generic_ip points to the associated struct yaffs_obj. */ /* @@ -204,18 +204,18 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino); #endif #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18)) -#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private) +#define yaffs_inode_to_obj_lv(iptr) ((iptr)->i_private) #else -#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip) +#define yaffs_inode_to_obj_lv(iptr) ((iptr)->u.generic_ip) #endif -#define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr))) -#define yaffs_dentry_to_obj(dptr) yaffs_InodeToObject((dptr)->d_inode) +#define yaffs_inode_to_obj(iptr) ((struct yaffs_obj *)(yaffs_inode_to_obj_lv(iptr))) +#define yaffs_dentry_to_obj(dptr) yaffs_inode_to_obj((dptr)->d_inode) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->s_fs_info) +#define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->s_fs_info) #else -#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->u.generic_sbp) +#define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->u.generic_sbp) #endif @@ -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_touch_super(yaffs_Device *dev); +static void yaffs_touch_super(struct yaffs_dev *dev); static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin); @@ -507,22 +507,22 @@ static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) } -static unsigned yaffs_gc_control_callback(yaffs_Device *dev) +static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev) { return yaffs_gc_control; } -static void yaffs_gross_lock(yaffs_Device *dev) +static void yaffs_gross_lock(struct yaffs_dev *dev) { T(YAFFS_TRACE_LOCK, (TSTR("yaffs locking %p\n"), current)); - down(&(yaffs_dev_to_lc(dev)->grossLock)); + down(&(yaffs_dev_to_lc(dev)->gross_lock)); T(YAFFS_TRACE_LOCK, (TSTR("yaffs locked %p\n"), current)); } -static void yaffs_gross_unlock(yaffs_Device *dev) +static void yaffs_gross_unlock(struct yaffs_dev *dev) { T(YAFFS_TRACE_LOCK, (TSTR("yaffs unlocking %p\n"), current)); - up(&(yaffs_dev_to_lc(dev)->grossLock)); + up(&(yaffs_dev_to_lc(dev)->gross_lock)); } #ifdef YAFFS_COMPILE_EXPORTFS @@ -552,10 +552,10 @@ struct dentry *yaffs2_get_parent(struct dentry *dentry) struct dentry *parent = ERR_PTR(-ENOENT); struct inode *inode; unsigned long parent_ino; - yaffs_Object *d_obj; - yaffs_Object *parent_obj; + struct yaffs_obj *d_obj; + struct yaffs_obj *parent_obj; - d_obj = yaffs_InodeToObject(dentry->d_inode); + d_obj = yaffs_inode_to_obj(dentry->d_inode); if (d_obj) { parent_obj = d_obj->parent; @@ -599,45 +599,45 @@ static struct export_operations yaffs_export_ops = * A search context iterates along a doubly linked list of siblings in the * directory. If the iterating object is deleted then this would corrupt * the list iteration, likely causing a crash. The search context avoids - * this by using the removeObjectCallback to move the search context to the + * this by using the remove_obj_fn to move the search context to the * next object before the object is deleted. * * Many readdirs (and thus seach conexts) may be alive simulateously so - * each yaffs_Device has a list of these. + * each struct yaffs_dev has a list of these. * * A seach context lives for the duration of a readdir. * * All these functions must be called while yaffs is locked. */ -struct yaffs_SearchContext { - yaffs_Device *dev; - yaffs_Object *dirObj; - yaffs_Object *nextReturn; +struct yaffs_search_context { + struct yaffs_dev *dev; + struct yaffs_obj *dir_obj; + struct yaffs_obj *next_return; struct ylist_head others; }; /* - * yaffs_NewSearch() creates a new search context, initialises it and + * yaffs_new_search() creates a new search context, initialises it and * adds it to the device's search context list. * * Called at start of readdir. */ -static struct yaffs_SearchContext * yaffs_NewSearch(yaffs_Object *dir) +static struct yaffs_search_context * yaffs_new_search(struct yaffs_obj *dir) { - yaffs_Device *dev = dir->myDev; - struct yaffs_SearchContext *sc = YMALLOC(sizeof(struct yaffs_SearchContext)); + struct yaffs_dev *dev = dir->my_dev; + struct yaffs_search_context *sc = YMALLOC(sizeof(struct yaffs_search_context)); if(sc){ - sc->dirObj = dir; + sc->dir_obj = dir; sc->dev = dev; - if( ylist_empty(&sc->dirObj->variant.directoryVariant.children)) - sc->nextReturn = NULL; + if( ylist_empty(&sc->dir_obj->variant.dir_variant.children)) + sc->next_return = NULL; else - sc->nextReturn = ylist_entry( - dir->variant.directoryVariant.children.next, - yaffs_Object,siblings); + sc->next_return = ylist_entry( + dir->variant.dir_variant.children.next, + struct yaffs_obj,siblings); YINIT_LIST_HEAD(&sc->others); - ylist_add(&sc->others,&(yaffs_dev_to_lc(dev)->searchContexts)); + ylist_add(&sc->others,&(yaffs_dev_to_lc(dev)->search_contexts)); } return sc; } @@ -645,7 +645,7 @@ static struct yaffs_SearchContext * yaffs_NewSearch(yaffs_Object *dir) /* * yaffs_search_end() disposes of a search context and cleans up. */ -static void yaffs_search_end(struct yaffs_SearchContext * sc) +static void yaffs_search_end(struct yaffs_search_context * sc) { if(sc){ ylist_del(&sc->others); @@ -658,21 +658,21 @@ static void yaffs_search_end(struct yaffs_SearchContext * sc) * Called when the search iterates or when an object removal causes * the search context to be moved to the next object. */ -static void yaffs_search_advance(struct yaffs_SearchContext *sc) +static void yaffs_search_advance(struct yaffs_search_context *sc) { if(!sc) return; - if( sc->nextReturn == NULL || - ylist_empty(&sc->dirObj->variant.directoryVariant.children)) - sc->nextReturn = NULL; + if( sc->next_return == NULL || + ylist_empty(&sc->dir_obj->variant.dir_variant.children)) + sc->next_return = NULL; else { - struct ylist_head *next = sc->nextReturn->siblings.next; + struct ylist_head *next = sc->next_return->siblings.next; - if( next == &sc->dirObj->variant.directoryVariant.children) - sc->nextReturn = NULL; /* end of list */ + if( next == &sc->dir_obj->variant.dir_variant.children) + sc->next_return = NULL; /* end of list */ else - sc->nextReturn = ylist_entry(next,yaffs_Object,siblings); + sc->next_return = ylist_entry(next,struct yaffs_obj,siblings); } } @@ -681,12 +681,12 @@ static void yaffs_search_advance(struct yaffs_SearchContext *sc) * We check open search contexts and advance any which are currently * on the object being iterated. */ -static void yaffs_remove_obj_callback(yaffs_Object *obj) +static void yaffs_remove_obj_callback(struct yaffs_obj *obj) { struct ylist_head *i; - struct yaffs_SearchContext *sc; - struct ylist_head *search_contexts = &(yaffs_dev_to_lc(obj->myDev)->searchContexts); + struct yaffs_search_context *sc; + struct ylist_head *search_contexts = &(yaffs_dev_to_lc(obj->my_dev)->search_contexts); /* Iterate through the directory search contexts. @@ -695,8 +695,8 @@ static void yaffs_remove_obj_callback(yaffs_Object *obj) */ ylist_for_each(i, search_contexts) { if (i) { - sc = ylist_entry(i, struct yaffs_SearchContext,others); - if(sc->nextReturn == obj) + sc = ylist_entry(i, struct yaffs_search_context,others); + if(sc->next_return == obj) yaffs_search_advance(sc); } } @@ -712,7 +712,7 @@ static int yaffs_readlink(struct dentry *dentry, char __user *buffer, unsigned char *alias; int ret; - yaffs_Device *dev = yaffs_dentry_to_obj(dentry)->myDev; + struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; yaffs_gross_lock(dev); @@ -730,13 +730,16 @@ static int yaffs_readlink(struct dentry *dentry, char __user *buffer, #if (YAFFS_NEW_FOLLOW_LINK == 1) static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) +{ + void *ret; #else static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) -#endif { + int ret +#endif unsigned char *alias; - int ret; - yaffs_Device *dev = yaffs_dentry_to_obj(dentry)->myDev; + int ret_int = 0; + struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; yaffs_gross_lock(dev); @@ -744,19 +747,23 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) yaffs_gross_unlock(dev); if (!alias) { - ret = -ENOMEM; + ret_int = -ENOMEM; goto out; } #if (YAFFS_NEW_FOLLOW_LINK == 1) nd_set_link(nd, alias); - ret = (int)alias; + ret = alias; out: - return ERR_PTR(ret); + if(ret_int) + ret = ERR_PTR(ret_int); + return ret; #else ret = vfs_follow_link(nd, alias); kfree(alias); out: + if(ret_int) + ret = ret_int; return ret; #endif } @@ -768,7 +775,7 @@ void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) { #endif struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, - yaffs_Object *obj); + struct yaffs_obj *obj); /* * Lookup is used to find objects in the fs @@ -781,30 +788,30 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) #endif { - yaffs_Object *obj; + struct yaffs_obj *obj; struct inode *inode = NULL; /* NCB 2.5/2.6 needs NULL here */ - yaffs_Device *dev = yaffs_InodeToObject(dir)->myDev; + struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev; - if(current != yaffs_dev_to_lc(dev)->readdirProcess) + if(current != yaffs_dev_to_lc(dev)->readdir_process) yaffs_gross_lock(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_lookup for %d:%s\n"), - yaffs_InodeToObject(dir)->objectId, dentry->d_name.name)); + yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name)); - obj = yaffs_find_by_name(yaffs_InodeToObject(dir), + obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name); 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_dev_to_lc(dev)->readdirProcess) + if(current != yaffs_dev_to_lc(dev)->readdir_process) yaffs_gross_unlock(dev); if (obj) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_lookup found %d\n"), obj->objectId)); + (TSTR("yaffs_lookup found %d\n"), obj->obj_id)); inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); @@ -850,13 +857,13 @@ static void yaffs_put_inode(struct inode *inode) #endif -static void yaffs_unstitch_obj(struct inode *inode, yaffs_Object *obj) +static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj) { /* Clear the association between the inode and - * the yaffs_Object. + * the struct yaffs_obj. */ - obj->myInode = NULL; - yaffs_InodeToObjectLV(inode) = NULL; + obj->my_inode = NULL; + yaffs_inode_to_obj_lv(inode) = NULL; /* If the object freeing was deferred, then the real * free happens now. @@ -872,11 +879,11 @@ static void yaffs_unstitch_obj(struct inode *inode, yaffs_Object *obj) */ static void yaffs_evict_inode( struct inode *inode) { - yaffs_Object *obj; - yaffs_Device *dev; + struct yaffs_obj *obj; + struct yaffs_dev *dev; int deleteme = 0; - obj = yaffs_InodeToObject(inode); + obj = yaffs_inode_to_obj(inode); T(YAFFS_TRACE_OS, (TSTR("yaffs_evict_inode: ino %d, count %d %s\n"), (int)inode->i_ino, @@ -889,13 +896,13 @@ static void yaffs_evict_inode( struct inode *inode) end_writeback(inode); if(deleteme && obj){ - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); yaffs_del_obj(obj); yaffs_gross_unlock(dev); } if (obj) { - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); yaffs_unstitch_obj(inode,obj); yaffs_gross_unlock(dev); @@ -914,10 +921,10 @@ static void yaffs_evict_inode( struct inode *inode) static void yaffs_clear_inode(struct inode *inode) { - yaffs_Object *obj; - yaffs_Device *dev; + struct yaffs_obj *obj; + struct yaffs_dev *dev; - obj = yaffs_InodeToObject(inode); + obj = yaffs_inode_to_obj(inode); T(YAFFS_TRACE_OS, (TSTR("yaffs_clear_inode: ino %d, count %d %s\n"), (int)inode->i_ino, @@ -925,7 +932,7 @@ static void yaffs_clear_inode(struct inode *inode) obj ? "object exists" : "null object")); if (obj) { - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); yaffs_unstitch_obj(inode,obj); yaffs_gross_unlock(dev); @@ -940,8 +947,8 @@ static void yaffs_clear_inode(struct inode *inode) */ static void yaffs_delete_inode(struct inode *inode) { - yaffs_Object *obj = yaffs_InodeToObject(inode); - yaffs_Device *dev; + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); + struct yaffs_dev *dev; T(YAFFS_TRACE_OS, (TSTR("yaffs_delete_inode: ino %d, count %d %s\n"), (int)inode->i_ino, @@ -949,7 +956,7 @@ static void yaffs_delete_inode(struct inode *inode) obj ? "object exists" : "null object")); if (obj) { - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); yaffs_del_obj(obj); yaffs_gross_unlock(dev); @@ -968,12 +975,12 @@ 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_dentry_to_obj(file->f_dentry); + struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry); - yaffs_Device *dev = obj->myDev; + struct yaffs_dev *dev = obj->my_dev; T(YAFFS_TRACE_OS, - (TSTR("yaffs_file_flush object %d (%s)\n"), obj->objectId, + (TSTR("yaffs_file_flush object %d (%s)\n"), obj->obj_id, obj->dirty ? "dirty" : "clean")); yaffs_gross_lock(dev); @@ -989,11 +996,11 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) { /* Lifted from jffs2 */ - yaffs_Object *obj; + struct yaffs_obj *obj; unsigned char *pg_buf; int ret; - yaffs_Device *dev; + struct yaffs_dev *dev; T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage_nolock at %08x, size %08x\n"), @@ -1002,7 +1009,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) obj = yaffs_dentry_to_obj(f->f_dentry); - dev = obj->myDev; + dev = obj->my_dev; #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) BUG_ON(!PageLocked(pg)); @@ -1065,14 +1072,14 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc) static int yaffs_writepage(struct page *page) #endif { - yaffs_Device *dev; + struct yaffs_dev *dev; struct address_space *mapping = page->mapping; struct inode *inode; unsigned long end_index; char *buffer; - yaffs_Object *obj; - int nWritten = 0; - unsigned nBytes; + struct yaffs_obj *obj; + int n_written = 0; + unsigned n_bytes; loff_t i_size; if (!mapping) @@ -1085,11 +1092,11 @@ static int yaffs_writepage(struct page *page) end_index = i_size >> PAGE_CACHE_SHIFT; if(page->index < end_index) - nBytes = PAGE_CACHE_SIZE; + n_bytes = PAGE_CACHE_SIZE; else { - nBytes = i_size & (PAGE_CACHE_SIZE -1); + n_bytes = i_size & (PAGE_CACHE_SIZE -1); - if (page->index > end_index || !nBytes) { + if (page->index > end_index || !n_bytes) { T(YAFFS_TRACE_OS, (TSTR("yaffs_writepage at %08x, inode size = %08x!!!\n"), (unsigned)(page->index << PAGE_CACHE_SHIFT), @@ -1105,32 +1112,32 @@ static int yaffs_writepage(struct page *page) } } - if(nBytes != PAGE_CACHE_SIZE) - zero_user_segment(page,nBytes,PAGE_CACHE_SIZE); + if(n_bytes != PAGE_CACHE_SIZE) + zero_user_segment(page,n_bytes,PAGE_CACHE_SIZE); get_page(page); buffer = kmap(page); - obj = yaffs_InodeToObject(inode); - dev = obj->myDev; + obj = yaffs_inode_to_obj(inode); + dev = obj->my_dev; yaffs_gross_lock(dev); T(YAFFS_TRACE_OS, (TSTR("yaffs_writepage at %08x, size %08x\n"), - (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes)); + (unsigned)(page->index << PAGE_CACHE_SHIFT), n_bytes)); T(YAFFS_TRACE_OS, (TSTR("writepag0: obj = %05x, ino = %05x\n"), - (int)obj->variant.fileVariant.fileSize, (int)inode->i_size)); + (int)obj->variant.file_variant.file_size, (int)inode->i_size)); - nWritten = yaffs_wr_file(obj, buffer, - page->index << PAGE_CACHE_SHIFT, nBytes, 0); + n_written = yaffs_wr_file(obj, buffer, + page->index << PAGE_CACHE_SHIFT, n_bytes, 0); yaffs_touch_super(dev); T(YAFFS_TRACE_OS, (TSTR("writepag1: obj = %05x, ino = %05x\n"), - (int)obj->variant.fileVariant.fileSize, (int)inode->i_size)); + (int)obj->variant.file_variant.file_size, (int)inode->i_size)); yaffs_gross_unlock(dev); @@ -1140,7 +1147,7 @@ static int yaffs_writepage(struct page *page) end_page_writeback(page); put_page(page); - return (nWritten == nBytes) ? 0 : -ENOSPC; + return (n_written == n_bytes) ? 0 : -ENOSPC; } @@ -1230,7 +1237,7 @@ static int yaffs_write_end(struct file *filp, struct address_space *mapping, addr = kva + offset_into_page; T(YAFFS_TRACE_OS, - ("yaffs_write_end addr %p pos %x nBytes %d\n", + ("yaffs_write_end addr %p pos %x n_bytes %d\n", addr,(unsigned)pos, copied)); ret = yaffs_file_write(filp, addr, copied, &pos); @@ -1259,8 +1266,8 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, void *addr, *kva; loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset; - int nBytes = to - offset; - int nWritten; + int n_bytes = to - offset; + int n_written; unsigned spos = pos; unsigned saddr; @@ -1271,15 +1278,15 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, saddr = (unsigned) addr; T(YAFFS_TRACE_OS, - (TSTR("yaffs_commit_write addr %x pos %x nBytes %d\n"), - saddr, spos, nBytes)); + (TSTR("yaffs_commit_write addr %x pos %x n_bytes %d\n"), + saddr, spos, n_bytes)); - nWritten = yaffs_file_write(f, addr, nBytes, &pos); + n_written = yaffs_file_write(f, addr, n_bytes, &pos); - if (nWritten != nBytes) { + if (n_written != n_bytes) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_commit_write not same size nWritten %d nBytes %d\n"), - nWritten, nBytes)); + (TSTR("yaffs_commit_write not same size n_written %d n_bytes %d\n"), + n_written, n_bytes)); SetPageError(pg); } else { /* Nothing */ @@ -1289,21 +1296,21 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, T(YAFFS_TRACE_OS, (TSTR("yaffs_commit_write returning %d\n"), - nWritten == nBytes ? 0 : nWritten)); + n_written == n_bytes ? 0 : n_written)); - return nWritten == nBytes ? 0 : nWritten; + return n_written == n_bytes ? 0 : n_written; } #endif -static void yaffs_fill_inode_from_obj(struct inode *inode, yaffs_Object *obj) +static void yaffs_fill_inode_from_obj(struct inode *inode, struct yaffs_obj *obj) { if (inode && obj) { /* Check mode against the variant type and attempt to repair if broken. */ - __u32 mode = obj->yst_mode; - switch (obj->variantType) { + u32 mode = obj->yst_mode; + switch (obj->variant_type) { case YAFFS_OBJECT_TYPE_FILE: if (!S_ISREG(mode)) { obj->yst_mode &= ~S_IFMT; @@ -1335,7 +1342,7 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, yaffs_Object *obj) inode->i_flags |= S_NOATIME; - inode->i_ino = obj->objectId; + inode->i_ino = obj->obj_id; inode->i_mode = obj->yst_mode; inode->i_uid = obj->yst_uid; inode->i_gid = obj->yst_gid; @@ -1392,19 +1399,19 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, yaffs_Object *obj) break; } - yaffs_InodeToObjectLV(inode) = obj; + yaffs_inode_to_obj_lv(inode) = obj; - obj->myInode = inode; + obj->my_inode = inode; } else { T(YAFFS_TRACE_OS, - (TSTR("yaffs_FileInode invalid parameters\n"))); + (TSTR("yaffs_fill_inode invalid parameters\n"))); } } struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, - yaffs_Object *obj) + struct yaffs_obj *obj) { struct inode *inode; @@ -1423,15 +1430,15 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, } T(YAFFS_TRACE_OS, - (TSTR("yaffs_get_inode for object %d\n"), obj->objectId)); + (TSTR("yaffs_get_inode for object %d\n"), obj->obj_id)); - inode = Y_IGET(sb, obj->objectId); + inode = Y_IGET(sb, obj->obj_id); if (IS_ERR(inode)) return NULL; /* NB Side effect: iget calls back to yaffs_read_inode(). */ /* iget also increments the inode's i_count */ - /* NB You can't be holding grossLock or deadlock will happen! */ + /* NB You can't be holding gross_lock or deadlock will happen! */ return inode; } @@ -1439,14 +1446,14 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_t *pos) { - yaffs_Object *obj; - int nWritten, ipos; + struct yaffs_obj *obj; + int n_written, ipos; struct inode *inode; - yaffs_Device *dev; + struct yaffs_dev *dev; obj = yaffs_dentry_to_obj(f->f_dentry); - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); @@ -1464,9 +1471,9 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, T(YAFFS_TRACE_OS, (TSTR("yaffs_file_write about to write writing %u(%x) bytes" "to object %d at %d(%x)\n"), - (unsigned) n, (unsigned) n, obj->objectId, ipos,ipos)); + (unsigned) n, (unsigned) n, obj->obj_id, ipos,ipos)); - nWritten = yaffs_wr_file(obj, buf, ipos, n, 0); + n_written = yaffs_wr_file(obj, buf, ipos, n, 0); yaffs_touch_super(dev); @@ -1474,8 +1481,8 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, (TSTR("yaffs_file_write: %d(%x) bytes written\n"), (unsigned )n,(unsigned)n)); - if (nWritten > 0) { - ipos += nWritten; + if (n_written > 0) { + ipos += n_written; *pos = ipos; if (ipos > inode->i_size) { inode->i_size = ipos; @@ -1489,7 +1496,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, } yaffs_gross_unlock(dev); - return (nWritten == 0) && (n > 0) ? -ENOSPC : nWritten; + return (n_written == 0) && (n > 0) ? -ENOSPC : n_written; } /* Space holding and freeing is done to ensure we have space available for write_begin/end */ @@ -1498,34 +1505,34 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, static ssize_t yaffs_hold_space(struct file *f) { - yaffs_Object *obj; - yaffs_Device *dev; + struct yaffs_obj *obj; + struct yaffs_dev *dev; - int nFreeChunks; + int n_free_chunks; obj = yaffs_dentry_to_obj(f->f_dentry); - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); - nFreeChunks = yaffs_get_n_free_chunks(dev); + n_free_chunks = yaffs_get_n_free_chunks(dev); yaffs_gross_unlock(dev); - return (nFreeChunks > 20) ? 1 : 0; + return (n_free_chunks > 20) ? 1 : 0; } static void yaffs_release_space(struct file *f) { - yaffs_Object *obj; - yaffs_Device *dev; + struct yaffs_obj *obj; + struct yaffs_dev *dev; obj = yaffs_dentry_to_obj(f->f_dentry); - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); @@ -1562,28 +1569,28 @@ static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin) static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) { - yaffs_Object *obj; - yaffs_Device *dev; - struct yaffs_SearchContext *sc; + struct yaffs_obj *obj; + struct yaffs_dev *dev; + struct yaffs_search_context *sc; struct inode *inode = f->f_dentry->d_inode; unsigned long offset, curoffs; - yaffs_Object *l; - int retVal = 0; + struct yaffs_obj *l; + int ret_val = 0; char name[YAFFS_MAX_NAME_LENGTH + 1]; obj = yaffs_dentry_to_obj(f->f_dentry); - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); - yaffs_dev_to_lc(dev)->readdirProcess = current; + yaffs_dev_to_lc(dev)->readdir_process = current; offset = f->f_pos; - sc = yaffs_NewSearch(obj); + sc = yaffs_new_search(obj); if(!sc){ - retVal = -ENOMEM; + ret_val = -ENOMEM; goto out; } @@ -1627,9 +1634,9 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) f->f_version = inode->i_version; } - while(sc->nextReturn){ + while(sc->next_return){ curoffs++; - l = sc->nextReturn; + l = sc->next_return; if (curoffs >= offset) { int this_inode = yaffs_get_obj_inode(l); int this_type = yaffs_get_obj_type(l); @@ -1662,10 +1669,10 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) out: yaffs_search_end(sc); - yaffs_dev_to_lc(dev)->readdirProcess = NULL; + yaffs_dev_to_lc(dev)->readdir_process = NULL; yaffs_gross_unlock(dev); - return retVal; + return ret_val; } @@ -1690,10 +1697,10 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, { struct inode *inode; - yaffs_Object *obj = NULL; - yaffs_Device *dev; + struct yaffs_obj *obj = NULL; + struct yaffs_dev *dev; - yaffs_Object *parent = yaffs_InodeToObject(dir); + struct yaffs_obj *parent = yaffs_inode_to_obj(dir); int error = -ENOSPC; uid_t uid = YCRED(current)->fsuid; @@ -1705,7 +1712,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, if (parent) { T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: parent object %d type %d\n"), - parent->objectId, parent->variantType)); + parent->obj_id, parent->variant_type)); } else { T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: could not get parent object\n"))); @@ -1716,7 +1723,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, "mode %x dev %x\n"), dentry->d_name.name, mode, rdev)); - dev = parent->myDev; + dev = parent->my_dev; yaffs_gross_lock(dev); @@ -1758,7 +1765,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, update_dir_time(dir); T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod created object %d count = %d\n"), - obj->objectId, atomic_read(&inode->i_count))); + obj->obj_id, atomic_read(&inode->i_count))); error = 0; yaffs_fill_inode_from_obj(dir,parent); } else { @@ -1772,10 +1779,10 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) { - int retVal; + int ret_val; T(YAFFS_TRACE_OS, (TSTR("yaffs_mkdir\n"))); - retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); - return retVal; + ret_val = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); + return ret_val; } #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) @@ -1791,23 +1798,23 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) static int yaffs_unlink(struct inode *dir, struct dentry *dentry) { - int retVal; + int ret_val; - yaffs_Device *dev; - yaffs_Object *obj; + struct yaffs_dev *dev; + struct yaffs_obj *obj; T(YAFFS_TRACE_OS, (TSTR("yaffs_unlink %d:%s\n"), (int)(dir->i_ino), dentry->d_name.name)); - obj = yaffs_InodeToObject(dir); - dev = obj->myDev; + obj = yaffs_inode_to_obj(dir); + dev = obj->my_dev; yaffs_gross_lock(dev); - retVal = yaffs_unlinker(obj, dentry->d_name.name); + ret_val = yaffs_unlinker(obj, dentry->d_name.name); - if (retVal == YAFFS_OK) { + if (ret_val == YAFFS_OK) { dentry->d_inode->i_nlink--; dir->i_version++; yaffs_gross_unlock(dev); @@ -1826,19 +1833,19 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) { struct inode *inode = old_dentry->d_inode; - yaffs_Object *obj = NULL; - yaffs_Object *link = NULL; - yaffs_Device *dev; + struct yaffs_obj *obj = NULL; + struct yaffs_obj *link = NULL; + struct yaffs_dev *dev; T(YAFFS_TRACE_OS, (TSTR("yaffs_link\n"))); - obj = yaffs_InodeToObject(inode); - dev = obj->myDev; + obj = yaffs_inode_to_obj(inode); + dev = obj->my_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, + link = yaffs_link_obj(yaffs_inode_to_obj(dir), dentry->d_name.name, obj); if (link) { @@ -1864,16 +1871,16 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, static int yaffs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) { - yaffs_Object *obj; - yaffs_Device *dev; + struct yaffs_obj *obj; + struct yaffs_dev *dev; uid_t uid = YCRED(current)->fsuid; gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; T(YAFFS_TRACE_OS, (TSTR("yaffs_symlink\n"))); - dev = yaffs_InodeToObject(dir)->myDev; + dev = yaffs_inode_to_obj(dir)->my_dev; yaffs_gross_lock(dev); - obj = yaffs_create_symlink(yaffs_InodeToObject(dir), dentry->d_name.name, + obj = yaffs_create_symlink(yaffs_inode_to_obj(dir), dentry->d_name.name, S_IFLNK | S_IRWXUGO, uid, gid, symname); yaffs_gross_unlock(dev); @@ -1900,15 +1907,15 @@ static int yaffs_sync_object(struct file *file, struct dentry *dentry, #endif { - yaffs_Object *obj; - yaffs_Device *dev; + struct yaffs_obj *obj; + struct yaffs_dev *dev; #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) struct dentry *dentry = file->f_path.dentry; #endif obj = yaffs_dentry_to_obj(dentry); - dev = obj->myDev; + dev = obj->my_dev; T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, (TSTR("yaffs_sync_object\n"))); @@ -1926,39 +1933,39 @@ static int yaffs_sync_object(struct file *file, struct dentry *dentry, static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry) { - yaffs_Device *dev; - int retVal = YAFFS_FAIL; - yaffs_Object *target; + struct yaffs_dev *dev; + int ret_val = YAFFS_FAIL; + struct yaffs_obj *target; T(YAFFS_TRACE_OS, (TSTR("yaffs_rename\n"))); - dev = yaffs_InodeToObject(old_dir)->myDev; + dev = yaffs_inode_to_obj(old_dir)->my_dev; yaffs_gross_lock(dev); /* Check if the target is an existing directory that is not empty. */ - target = yaffs_find_by_name(yaffs_InodeToObject(new_dir), + target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir), new_dentry->d_name.name); - if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY && - !ylist_empty(&target->variant.directoryVariant.children)) { + if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY && + !ylist_empty(&target->variant.dir_variant.children)) { T(YAFFS_TRACE_OS, (TSTR("target is non-empty dir\n"))); - retVal = YAFFS_FAIL; + ret_val = YAFFS_FAIL; } else { /* Now does unlinking internally using shadowing mechanism */ T(YAFFS_TRACE_OS, (TSTR("calling yaffs_rename_obj\n"))); - retVal = yaffs_rename_obj(yaffs_InodeToObject(old_dir), + ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir), old_dentry->d_name.name, - yaffs_InodeToObject(new_dir), + yaffs_inode_to_obj(new_dir), new_dentry->d_name.name); } yaffs_gross_unlock(dev); - if (retVal == YAFFS_OK) { + if (ret_val == YAFFS_OK) { if (target) { new_dentry->d_inode->i_nlink--; mark_inode_dirty(new_dentry->d_inode); @@ -1977,11 +1984,11 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) { struct inode *inode = dentry->d_inode; int error = 0; - yaffs_Device *dev; + struct yaffs_dev *dev; T(YAFFS_TRACE_OS, (TSTR("yaffs_setattr of object %d\n"), - yaffs_InodeToObject(inode)->objectId)); + yaffs_inode_to_obj(inode)->obj_id)); /* Fail if a requested resize >= 2GB */ if (attr->ia_valid & ATTR_SIZE && @@ -2000,13 +2007,13 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) inode->i_blocks = (inode->i_size + 511) >> 9; } } - dev = yaffs_InodeToObject(inode)->myDev; + dev = yaffs_inode_to_obj(inode)->my_dev; if (attr->ia_valid & ATTR_SIZE){ T(YAFFS_TRACE_OS,(TSTR("resize to %d(%x)\n"), (int)(attr->ia_size),(int)(attr->ia_size))); } yaffs_gross_lock(dev); - result = yaffs_set_attribs(yaffs_InodeToObject(inode), attr); + result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr); if(result == YAFFS_OK) { error = 0; } else { @@ -2028,17 +2035,17 @@ int yaffs_setxattr(struct dentry *dentry, const char *name, { struct inode *inode = dentry->d_inode; int error = 0; - yaffs_Device *dev; - yaffs_Object *obj = yaffs_InodeToObject(inode); + struct yaffs_dev *dev; + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); T(YAFFS_TRACE_OS, (TSTR("yaffs_setxattr of object %d\n"), - obj->objectId)); + obj->obj_id)); if (error == 0) { int result; - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); result = yaffs_set_xattrib(obj, name, value, size, flags); if(result == YAFFS_OK) @@ -2060,15 +2067,15 @@ ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, void *buff, { struct inode *inode = dentry->d_inode; int error = 0; - yaffs_Device *dev; - yaffs_Object *obj = yaffs_InodeToObject(inode); + struct yaffs_dev *dev; + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); T(YAFFS_TRACE_OS, (TSTR("yaffs_getxattr \"%s\" from object %d\n"), - name, obj->objectId)); + name, obj->obj_id)); if (error == 0) { - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); error = yaffs_get_xattrib(obj, name, buff, size); yaffs_gross_unlock(dev); @@ -2084,17 +2091,17 @@ int yaffs_removexattr(struct dentry *dentry, const char *name) { struct inode *inode = dentry->d_inode; int error = 0; - yaffs_Device *dev; - yaffs_Object *obj = yaffs_InodeToObject(inode); + struct yaffs_dev *dev; + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); T(YAFFS_TRACE_OS, (TSTR("yaffs_removexattr of object %d\n"), - obj->objectId)); + obj->obj_id)); if (error == 0) { int result; - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); result = yaffs_remove_xattrib(obj, name); if(result == YAFFS_OK) @@ -2114,16 +2121,16 @@ ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) { struct inode *inode = dentry->d_inode; int error = 0; - yaffs_Device *dev; - yaffs_Object *obj = yaffs_InodeToObject(inode); + struct yaffs_dev *dev; + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); T(YAFFS_TRACE_OS, (TSTR("yaffs_listxattr of object %d\n"), - obj->objectId)); + obj->obj_id)); if (error == 0) { - dev = obj->myDev; + dev = obj->my_dev; yaffs_gross_lock(dev); error = yaffs_list_xattrib(obj, buff, size); yaffs_gross_unlock(dev); @@ -2141,16 +2148,16 @@ 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_dentry_to_obj(dentry)->myDev; + struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; 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) { - yaffs_Device *dev = yaffs_SuperToDevice(sb); + struct yaffs_dev *dev = yaffs_super_to_dev(sb); #else static int yaffs_statfs(struct super_block *sb, struct statfs *buf) { - yaffs_Device *dev = yaffs_SuperToDevice(sb); + struct yaffs_dev *dev = yaffs_super_to_dev(sb); #endif T(YAFFS_TRACE_OS, (TSTR("yaffs_statfs\n"))); @@ -2161,43 +2168,43 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) buf->f_bsize = sb->s_blocksize; buf->f_namelen = 255; - if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) { + if (dev->data_bytes_per_chunk & (dev->data_bytes_per_chunk - 1)) { /* Do this if chunk size is not a power of 2 */ - uint64_t bytesInDev; - uint64_t bytesFree; + uint64_t bytes_in_dev; + uint64_t bytes_free; - bytesInDev = ((uint64_t)((dev->param.endBlock - dev->param.startBlock + 1))) * - ((uint64_t)(dev->param.nChunksPerBlock * dev->nDataBytesPerChunk)); + bytes_in_dev = ((uint64_t)((dev->param.end_block - dev->param.start_block + 1))) * + ((uint64_t)(dev->param.chunks_per_block * dev->data_bytes_per_chunk)); - do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */ - buf->f_blocks = bytesInDev; + do_div(bytes_in_dev, sb->s_blocksize); /* bytes_in_dev becomes the number of blocks */ + buf->f_blocks = bytes_in_dev; - bytesFree = ((uint64_t)(yaffs_get_n_free_chunks(dev))) * - ((uint64_t)(dev->nDataBytesPerChunk)); + bytes_free = ((uint64_t)(yaffs_get_n_free_chunks(dev))) * + ((uint64_t)(dev->data_bytes_per_chunk)); - do_div(bytesFree, sb->s_blocksize); + do_div(bytes_free, sb->s_blocksize); - buf->f_bfree = bytesFree; + buf->f_bfree = bytes_free; - } else if (sb->s_blocksize > dev->nDataBytesPerChunk) { + } else if (sb->s_blocksize > dev->data_bytes_per_chunk) { buf->f_blocks = - (dev->param.endBlock - dev->param.startBlock + 1) * - dev->param.nChunksPerBlock / - (sb->s_blocksize / dev->nDataBytesPerChunk); + (dev->param.end_block - dev->param.start_block + 1) * + dev->param.chunks_per_block / + (sb->s_blocksize / dev->data_bytes_per_chunk); buf->f_bfree = yaffs_get_n_free_chunks(dev) / - (sb->s_blocksize / dev->nDataBytesPerChunk); + (sb->s_blocksize / dev->data_bytes_per_chunk); } else { buf->f_blocks = - (dev->param.endBlock - dev->param.startBlock + 1) * - dev->param.nChunksPerBlock * - (dev->nDataBytesPerChunk / sb->s_blocksize); + (dev->param.end_block - dev->param.start_block + 1) * + dev->param.chunks_per_block * + (dev->data_bytes_per_chunk / sb->s_blocksize); buf->f_bfree = yaffs_get_n_free_chunks(dev) * - (dev->nDataBytesPerChunk / sb->s_blocksize); + (dev->data_bytes_per_chunk / sb->s_blocksize); } buf->f_files = 0; @@ -2213,13 +2220,13 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) static void yaffs_flush_inodes(struct super_block *sb) { struct inode *iptr; - yaffs_Object *obj; + struct yaffs_obj *obj; list_for_each_entry(iptr,&sb->s_inodes, i_sb_list){ - obj = yaffs_InodeToObject(iptr); + obj = yaffs_inode_to_obj(iptr); if(obj){ T(YAFFS_TRACE_OS, (TSTR("flushing obj %d\n"), - obj->objectId)); + obj->obj_id)); yaffs_flush_file(obj,1,0); } } @@ -2228,7 +2235,7 @@ static void yaffs_flush_inodes(struct super_block *sb) static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) { - yaffs_Device *dev = yaffs_SuperToDevice(sb); + struct yaffs_dev *dev = yaffs_super_to_dev(sb); if(!dev) return; @@ -2240,22 +2247,22 @@ static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) } -static unsigned yaffs_bg_gc_urgency(yaffs_Device *dev) +static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev) { - unsigned erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock; - struct yaffs_LinuxContext *context = yaffs_dev_to_lc(dev); - unsigned scatteredFree = 0; /* Free chunks not in an erased block */ + unsigned erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block; + struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); + unsigned scattered = 0; /* Free chunks not in an erased block */ - if(erasedChunks < dev->nFreeChunks) - scatteredFree = (dev->nFreeChunks - erasedChunks); + if(erased_chunks < dev->n_free_chunks) + scattered = (dev->n_free_chunks - erased_chunks); - if(!context->bgRunning) + if(!context->bg_running) return 0; - else if(scatteredFree < (dev->param.nChunksPerBlock * 2)) + else if(scattered < (dev->param.chunks_per_block * 2)) return 0; - else if(erasedChunks > dev->nFreeChunks/2) + else if(erased_chunks > dev->n_free_chunks/2) return 0; - else if(erasedChunks > dev->nFreeChunks/4) + else if(erased_chunks > dev->n_free_chunks/4) return 1; else return 2; @@ -2265,7 +2272,7 @@ static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint) { - yaffs_Device *dev = yaffs_SuperToDevice(sb); + struct yaffs_dev *dev = yaffs_super_to_dev(sb); unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4); unsigned gc_urgent = yaffs_bg_gc_urgency(dev); int do_checkpoint; @@ -2280,10 +2287,10 @@ static int yaffs_do_sync_fs(struct super_block *sb, yaffs_gross_lock(dev); do_checkpoint = ((request_checkpoint && !gc_urgent) || oneshot_checkpoint) && - !dev->isCheckpointed; + !dev->is_checkpointed; if (sb->s_dirt || do_checkpoint) { - yaffs_flush_super(sb, !dev->isCheckpointed && do_checkpoint); + yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint); sb->s_dirt = 0; if(oneshot_checkpoint) yaffs_auto_checkpoint &= ~4; @@ -2314,15 +2321,15 @@ void yaffs_background_waker(unsigned long data) static int yaffs_bg_thread_fn(void *data) { - yaffs_Device *dev = (yaffs_Device *)data; - struct yaffs_LinuxContext *context = yaffs_dev_to_lc(dev); + struct yaffs_dev *dev = (struct yaffs_dev *)data; + struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); unsigned long now = jiffies; unsigned long next_dir_update = now; unsigned long next_gc = now; unsigned long expires; unsigned int urgency; - int gcResult; + int gc_result; struct timer_list timer; T(YAFFS_TRACE_BACKGROUND, @@ -2332,7 +2339,7 @@ static int yaffs_bg_thread_fn(void *data) #ifdef YAFFS_COMPILE_FREEZER set_freezable(); #endif - while(context->bgRunning){ + while(context->bg_running){ T(YAFFS_TRACE_BACKGROUND, (TSTR("yaffs_background\n"))); @@ -2353,9 +2360,9 @@ static int yaffs_bg_thread_fn(void *data) } if(time_after(now,next_gc) && yaffs_bg_enable){ - if(!dev->isCheckpointed){ + if(!dev->is_checkpointed){ urgency = yaffs_bg_gc_urgency(dev); - gcResult = yaffs_bg_gc(dev, urgency); + gc_result = yaffs_bg_gc(dev, urgency); if(urgency > 1) next_gc = now + HZ/20+1; else if(urgency > 0) @@ -2393,36 +2400,36 @@ static int yaffs_bg_thread_fn(void *data) return 0; } -static int yaffs_bg_start(yaffs_Device *dev) +static int yaffs_bg_start(struct yaffs_dev *dev) { int retval = 0; - struct yaffs_LinuxContext *context = yaffs_dev_to_lc(dev); + struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); - if(dev->readOnly) + if(dev->read_only) return -1; - context->bgRunning = 1; + context->bg_running = 1; - context->bgThread = kthread_run(yaffs_bg_thread_fn, + context->bg_thread = kthread_run(yaffs_bg_thread_fn, (void *)dev,"yaffs-bg-%d",context->mount_id); - if(IS_ERR(context->bgThread)){ - retval = PTR_ERR(context->bgThread); - context->bgThread = NULL; - context->bgRunning = 0; + if(IS_ERR(context->bg_thread)){ + retval = PTR_ERR(context->bg_thread); + context->bg_thread = NULL; + context->bg_running = 0; } return retval; } -static void yaffs_bg_stop(yaffs_Device *dev) +static void yaffs_bg_stop(struct yaffs_dev *dev) { - struct yaffs_LinuxContext *ctxt = yaffs_dev_to_lc(dev); + struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev); - ctxt->bgRunning = 0; + ctxt->bg_running = 0; - if( ctxt->bgThread){ - kthread_stop(ctxt->bgThread); - ctxt->bgThread = NULL; + if( ctxt->bg_thread){ + kthread_stop(ctxt->bg_thread); + ctxt->bg_thread = NULL; } } #else @@ -2431,12 +2438,12 @@ static int yaffs_bg_thread_fn(void *data) return 0; } -static int yaffs_bg_start(yaffs_Device *dev) +static int yaffs_bg_start(struct yaffs_dev *dev) { return 0; } -static void yaffs_bg_stop(yaffs_Device *dev) +static void yaffs_bg_stop(struct yaffs_dev *dev) { } #endif @@ -2484,8 +2491,8 @@ static int yaffs_sync_fs(struct super_block *sb) static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) { struct inode *inode; - yaffs_Object *obj; - yaffs_Device *dev = yaffs_SuperToDevice(sb); + struct yaffs_obj *obj; + struct yaffs_dev *dev = yaffs_super_to_dev(sb); T(YAFFS_TRACE_OS, (TSTR("yaffs_iget for %lu\n"), ino)); @@ -2522,20 +2529,20 @@ static void yaffs_read_inode(struct inode *inode) * need to lock again. */ - yaffs_Object *obj; - yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb); + struct yaffs_obj *obj; + struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb); T(YAFFS_TRACE_OS, (TSTR("yaffs_read_inode for %d\n"), (int)inode->i_ino)); - if(current != yaffs_dev_to_lc(dev)->readdirProcess) + if(current != yaffs_dev_to_lc(dev)->readdir_process) yaffs_gross_lock(dev); obj = yaffs_find_by_number(dev, inode->i_ino); yaffs_fill_inode_from_obj(inode, obj); - if(current != yaffs_dev_to_lc(dev)->readdirProcess) + if(current != yaffs_dev_to_lc(dev)->readdir_process) yaffs_gross_unlock(dev); } @@ -2546,7 +2553,7 @@ struct semaphore yaffs_context_lock; static void yaffs_put_super(struct super_block *sb) { - yaffs_Device *dev = yaffs_SuperToDevice(sb); + struct yaffs_dev *dev = yaffs_super_to_dev(sb); T(YAFFS_TRACE_OS, (TSTR("yaffs_put_super\n"))); @@ -2560,8 +2567,8 @@ static void yaffs_put_super(struct super_block *sb) yaffs_flush_super(sb,1); - if (yaffs_dev_to_lc(dev)->putSuperFunc) - yaffs_dev_to_lc(dev)->putSuperFunc(sb); + if (yaffs_dev_to_lc(dev)->put_super_fn) + yaffs_dev_to_lc(dev)->put_super_fn(sb); yaffs_deinitialise(dev); @@ -2569,21 +2576,21 @@ static void yaffs_put_super(struct super_block *sb) yaffs_gross_unlock(dev); down(&yaffs_context_lock); - ylist_del_init(&(yaffs_dev_to_lc(dev)->contextList)); + ylist_del_init(&(yaffs_dev_to_lc(dev)->context_list)); up(&yaffs_context_lock); - if (yaffs_dev_to_lc(dev)->spareBuffer) { - YFREE(yaffs_dev_to_lc(dev)->spareBuffer); - yaffs_dev_to_lc(dev)->spareBuffer = NULL; + if (yaffs_dev_to_lc(dev)->spare_buffer) { + YFREE(yaffs_dev_to_lc(dev)->spare_buffer); + yaffs_dev_to_lc(dev)->spare_buffer = NULL; } kfree(dev); } -static void yaffs_MTDPutSuper(struct super_block *sb) +static void yaffs_mtd_put_super(struct super_block *sb) { - struct mtd_info *mtd = yaffs_dev_to_mtd(yaffs_SuperToDevice(sb)); + struct mtd_info *mtd = yaffs_dev_to_mtd(yaffs_super_to_dev(sb)); if (mtd->sync) mtd->sync(mtd); @@ -2592,9 +2599,9 @@ static void yaffs_MTDPutSuper(struct super_block *sb) } -static void yaffs_touch_super(yaffs_Device *dev) +static void yaffs_touch_super(struct yaffs_dev *dev) { - struct super_block *sb = yaffs_dev_to_lc(dev)->superBlock; + struct super_block *sb = yaffs_dev_to_lc(dev)->super; T(YAFFS_TRACE_OS, (TSTR("yaffs_touch_super() sb = %p\n"), sb)); if (sb) @@ -2681,31 +2688,31 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, struct super_block *sb, void *data, int silent) { - int nBlocks; + int n_blocks; struct inode *inode = NULL; struct dentry *root; - yaffs_Device *dev = 0; + struct yaffs_dev *dev = 0; char devname_buf[BDEVNAME_SIZE + 1]; struct mtd_info *mtd; int err; char *data_str = (char *)data; - struct yaffs_LinuxContext *context = NULL; - yaffs_DeviceParam *param; + struct yaffs_linux_context *context = NULL; + struct yaffs_param *param; - int readOnly = 0; + int read_only = 0; yaffs_options options; unsigned mount_id; int found; - struct yaffs_LinuxContext *context_iterator; + struct yaffs_linux_context *context_iterator; struct ylist_head *l; sb->s_magic = YAFFS_MAGIC; sb->s_op = &yaffs_super_ops; sb->s_flags |= MS_NOATIME; - readOnly =((sb->s_flags & MS_RDONLY) != 0); + read_only =((sb->s_flags & MS_RDONLY) != 0); #ifdef YAFFS_COMPILE_EXPORTFS @@ -2722,7 +2729,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, printk(KERN_INFO "yaffs: dev is %d name is \"%s\" %s\n", sb->s_dev, yaffs_devname(sb, devname_buf), - readOnly ? "ro" : "rw"); + read_only ? "ro" : "rw"); if (!data_str) data_str = ""; @@ -2859,17 +2866,17 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, /* OK, so if we got here, we have an MTD that's NAND and looks * like it has the right capabilities - * Set the yaffs_Device up for mtd + * Set the struct yaffs_dev up for mtd */ - if (!readOnly && !(mtd->flags & MTD_WRITEABLE)){ - readOnly = 1; + if (!read_only && !(mtd->flags & MTD_WRITEABLE)){ + read_only = 1; printk(KERN_INFO "yaffs: mtd is read only, setting superblock read only"); sb->s_flags |= MS_RDONLY; } - dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL); - context = kmalloc(sizeof(struct yaffs_LinuxContext),GFP_KERNEL); + dev = kmalloc(sizeof(struct yaffs_dev), GFP_KERNEL); + context = kmalloc(sizeof(struct yaffs_linux_context),GFP_KERNEL); if(!dev || !context ){ if(dev) @@ -2884,19 +2891,19 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, /* Deep shit could not allocate device structure */ T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs_read_super: Failed trying to allocate " - "yaffs_Device. \n"))); + "struct yaffs_dev. \n"))); return NULL; } - memset(dev, 0, sizeof(yaffs_Device)); + memset(dev, 0, sizeof(struct yaffs_dev)); param = &(dev->param); - memset(context,0,sizeof(struct yaffs_LinuxContext)); - dev->osContext = context; - YINIT_LIST_HEAD(&(context->contextList)); + memset(context,0,sizeof(struct yaffs_linux_context)); + dev->os_context = context; + YINIT_LIST_HEAD(&(context->context_list)); context->dev = dev; - context->superBlock = sb; + context->super = sb; - dev->readOnly = readOnly; + dev->read_only = read_only; #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) sb->s_fs_info = dev; @@ -2904,117 +2911,117 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, sb->u.generic_sbp = dev; #endif - dev->driverContext = mtd; + dev->driver_context = mtd; param->name = mtd->name; /* Set up the memory size parameters.... */ - nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK)); + n_blocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK)); - param->startBlock = 0; - param->endBlock = nBlocks - 1; - param->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK; - param->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK; - param->nReservedBlocks = 5; - param->nShortOpCaches = (options.no_cache) ? 0 : 10; - param->inbandTags = options.inband_tags; + param->start_block = 0; + param->end_block = n_blocks - 1; + param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK; + param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK; + param->n_reserved_blocks = 5; + param->n_caches = (options.no_cache) ? 0 : 10; + param->inband_tags = options.inband_tags; #ifdef CONFIG_YAFFS_DISABLE_LAZY_LOAD - param->disableLazyLoad = 1; + param->disable_lazy_load = 1; #endif #ifdef CONFIG_YAFFS_XATTR - param->enableXattr = 1; + param->enable_xattr = 1; #endif if(options.lazy_loading_overridden) - param->disableLazyLoad = !options.lazy_loading_enabled; + param->disable_lazy_load = !options.lazy_loading_enabled; #ifdef CONFIG_YAFFS_DISABLE_TAGS_ECC - param->noTagsECC = 1; + param->no_tags_ecc = 1; #endif #ifdef CONFIG_YAFFS_DISABLE_BACKGROUND #else - param->deferDirectoryUpdate = 1; + param->defered_dir_update = 1; #endif if(options.tags_ecc_overridden) - param->noTagsECC = !options.tags_ecc_on; + param->no_tags_ecc = !options.tags_ecc_on; #ifdef CONFIG_YAFFS_EMPTY_LOST_AND_FOUND - param->emptyLostAndFound = 1; + param->empty_lost_n_found = 1; #endif #ifdef CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING - param->refreshPeriod = 0; + param->refresh_period = 0; #else - param->refreshPeriod = 500; + param->refresh_period = 500; #endif #ifdef CONFIG_YAFFS__ALWAYS_CHECK_CHUNK_ERASED - param->alwaysCheckErased = 1; + param->always_check_erased = 1; #endif if(options.empty_lost_and_found_overridden) - param->emptyLostAndFound = options.empty_lost_and_found; + param->empty_lost_n_found = options.empty_lost_and_found; /* ... and the functions. */ if (yaffs_version == 2) { - param->writeChunkWithTagsToNAND = - nandmtd2_WriteChunkWithTagsToNAND; - param->readChunkWithTagsFromNAND = - nandmtd2_ReadChunkWithTagsFromNAND; - param->markNANDBlockBad = nandmtd2_MarkNANDBlockBad; - param->queryNANDBlock = nandmtd2_QueryNANDBlock; - yaffs_dev_to_lc(dev)->spareBuffer = YMALLOC(mtd->oobsize); - param->isYaffs2 = 1; + param->write_chunk_tags_fn = + nandmtd2_write_chunk_tags; + param->read_chunk_tags_fn = + nandmtd2_read_chunk_tags; + param->bad_block_fn = nandmtd2_mark_block_bad; + param->query_block_fn = nandmtd2_query_block; + yaffs_dev_to_lc(dev)->spare_buffer = YMALLOC(mtd->oobsize); + param->is_yaffs2 = 1; #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) - param->totalBytesPerChunk = mtd->writesize; - param->nChunksPerBlock = mtd->erasesize / mtd->writesize; + param->total_bytes_per_chunk = mtd->writesize; + param->chunks_per_block = mtd->erasesize / mtd->writesize; #else - param->totalBytesPerChunk = mtd->oobblock; - param->nChunksPerBlock = mtd->erasesize / mtd->oobblock; + param->total_bytes_per_chunk = mtd->oobblock; + param->chunks_per_block = mtd->erasesize / mtd->oobblock; #endif - nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize); + n_blocks = YCALCBLOCKS(mtd->size, mtd->erasesize); - param->startBlock = 0; - param->endBlock = nBlocks - 1; + param->start_block = 0; + param->end_block = n_blocks - 1; } else { #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) /* use the MTD interface in yaffs_mtdif1.c */ - param->writeChunkWithTagsToNAND = - nandmtd1_WriteChunkWithTagsToNAND; - param->readChunkWithTagsFromNAND = - nandmtd1_ReadChunkWithTagsFromNAND; - param->markNANDBlockBad = nandmtd1_MarkNANDBlockBad; - param->queryNANDBlock = nandmtd1_QueryNANDBlock; + param->write_chunk_tags_fn = + nandmtd1_write_chunk_tags; + param->read_chunk_tags_fn = + nandmtd1_read_chunk_tags; + param->bad_block_fn = nandmtd1_mark_block_bad; + param->query_block_fn = nandmtd1_query_block; #else - param->writeChunkToNAND = nandmtd_WriteChunkToNAND; - param->readChunkFromNAND = nandmtd_ReadChunkFromNAND; + param->write_chunk_fn = nandmtd_write_chunk; + param->read_chunk_fn = nandmtd_read_chunk; #endif - param->isYaffs2 = 0; + param->is_yaffs2 = 0; } /* ... and common functions */ - param->eraseBlockInNAND = nandmtd_EraseBlockInNAND; - param->initialiseNAND = nandmtd_InitialiseNAND; + param->erase_fn = nandmtd_erase_block; + param->initialise_flash_fn = nandmtd_initialise; - yaffs_dev_to_lc(dev)->putSuperFunc = yaffs_MTDPutSuper; + yaffs_dev_to_lc(dev)->put_super_fn = yaffs_mtd_put_super; - param->markSuperBlockDirty = yaffs_touch_super; - param->gcControl = yaffs_gc_control_callback; + param->sb_dirty_fn = yaffs_touch_super; + param->gc_control = yaffs_gc_control_callback; - yaffs_dev_to_lc(dev)->superBlock= sb; + yaffs_dev_to_lc(dev)->super= sb; #ifndef CONFIG_YAFFS_DOES_ECC - param->useNANDECC = 1; + param->use_nand_ecc = 1; #endif #ifdef CONFIG_YAFFS_DISABLE_WIDE_TNODES - param->wideTnodesDisabled = 1; + param->wide_tnodes_disabled = 1; #endif - param->skipCheckpointRead = options.skip_checkpoint_read; - param->skipCheckpointWrite = options.skip_checkpoint_write; + param->skip_checkpt_rd = options.skip_checkpoint_read; + param->skip_checkpt_wr = options.skip_checkpoint_write; down(&yaffs_context_lock); /* Get a mount id */ @@ -3022,21 +3029,21 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, for(mount_id=0; ! found; mount_id++){ found = 1; ylist_for_each(l,&yaffs_context_list){ - context_iterator = ylist_entry(l,struct yaffs_LinuxContext,contextList); + context_iterator = ylist_entry(l,struct yaffs_linux_context,context_list); if(context_iterator->mount_id == mount_id) found = 0; } } context->mount_id = mount_id; - ylist_add_tail(&(yaffs_dev_to_lc(dev)->contextList), &yaffs_context_list); + ylist_add_tail(&(yaffs_dev_to_lc(dev)->context_list), &yaffs_context_list); up(&yaffs_context_lock); /* Directory search handling...*/ - YINIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->searchContexts)); - param->removeObjectCallback = yaffs_remove_obj_callback; + YINIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->search_contexts)); + param->remove_obj_fn = yaffs_remove_obj_callback; - init_MUTEX(&(yaffs_dev_to_lc(dev)->grossLock)); + init_MUTEX(&(yaffs_dev_to_lc(dev)->gross_lock)); yaffs_gross_lock(dev); @@ -3049,8 +3056,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, if(err == YAFFS_OK) yaffs_bg_start(dev); - if(!context->bgThread) - param->deferDirectoryUpdate = 0; + if(!context->bg_thread) + param->defered_dir_update = 0; /* Release lock before yaffs_get_inode() */ @@ -3059,7 +3066,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, /* Create root inode */ if (err == YAFFS_OK) inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0, - yaffs_Root(dev)); + yaffs_root(dev)); if (!inode) return NULL; @@ -3078,10 +3085,10 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, return NULL; } sb->s_root = root; - sb->s_dirt = !dev->isCheckpointed; + sb->s_dirt = !dev->is_checkpointed; T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs_read_super: isCheckpointed %d\n"), - dev->isCheckpointed)); + (TSTR("yaffs_read_super: is_checkpointed %d\n"), + dev->is_checkpointed)); T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: done\n"))); return sb; @@ -3185,21 +3192,21 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, static struct proc_dir_entry *my_proc_entry; static struct proc_dir_entry *debug_proc_entry; -static char *yaffs_dump_dev_part0(char *buf, yaffs_Device * dev) -{ - buf += sprintf(buf, "startBlock......... %d\n", dev->param.startBlock); - buf += sprintf(buf, "endBlock........... %d\n", dev->param.endBlock); - buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->param.totalBytesPerChunk); - buf += sprintf(buf, "useNANDECC......... %d\n", dev->param.useNANDECC); - buf += sprintf(buf, "noTagsECC.......... %d\n", dev->param.noTagsECC); - buf += sprintf(buf, "isYaffs2........... %d\n", dev->param.isYaffs2); - buf += sprintf(buf, "inbandTags......... %d\n", dev->param.inbandTags); - buf += sprintf(buf, "emptyLostAndFound.. %d\n", dev->param.emptyLostAndFound); - buf += sprintf(buf, "disableLazyLoad.... %d\n", dev->param.disableLazyLoad); - buf += sprintf(buf, "refreshPeriod...... %d\n", dev->param.refreshPeriod); - buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->param.nShortOpCaches); - buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->param.nReservedBlocks); - buf += sprintf(buf, "alwaysCheckErased.. %d\n", dev->param.alwaysCheckErased); +static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev * dev) +{ + buf += sprintf(buf, "start_block.......... %d\n", dev->param.start_block); + buf += sprintf(buf, "end_block............ %d\n", dev->param.end_block); + buf += sprintf(buf, "total_bytes_per_chunk %d\n", dev->param.total_bytes_per_chunk); + buf += sprintf(buf, "use_nand_ecc......... %d\n", dev->param.use_nand_ecc); + buf += sprintf(buf, "no_tags_ecc.......... %d\n", dev->param.no_tags_ecc); + buf += sprintf(buf, "is_yaffs2............ %d\n", dev->param.is_yaffs2); + buf += sprintf(buf, "inband_tags.......... %d\n", dev->param.inband_tags); + buf += sprintf(buf, "empty_lost_n_found... %d\n", dev->param.empty_lost_n_found); + buf += sprintf(buf, "disable_lazy_load.... %d\n", dev->param.disable_lazy_load); + buf += sprintf(buf, "refresh_period....... %d\n", dev->param.refresh_period); + buf += sprintf(buf, "n_caches............. %d\n", dev->param.n_caches); + buf += sprintf(buf, "n_reserved_blocks.... %d\n", dev->param.n_reserved_blocks); + buf += sprintf(buf, "always_check_erased.. %d\n", dev->param.always_check_erased); buf += sprintf(buf, "\n"); @@ -3207,39 +3214,38 @@ static char *yaffs_dump_dev_part0(char *buf, yaffs_Device * dev) } -static char *yaffs_dump_dev_part1(char *buf, yaffs_Device * dev) +static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev * dev) { - buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk); - buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits); - buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize); - buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks); - buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint); + buf += sprintf(buf, "data_bytes_per_chunk. %d\n", dev->data_bytes_per_chunk); + buf += sprintf(buf, "chunk_grp_bits....... %d\n", dev->chunk_grp_bits); + buf += sprintf(buf, "chunk_grp_size....... %d\n", dev->chunk_grp_size); + buf += sprintf(buf, "n_erased_blocks...... %d\n", dev->n_erased_blocks); + buf += sprintf(buf, "blocks_in_checkpt.... %d\n", dev->blocks_in_checkpt); buf += sprintf(buf, "\n"); - buf += sprintf(buf, "nTnodes............ %d\n", dev->nTnodes); - buf += sprintf(buf, "nObjects........... %d\n", dev->nObjects); - buf += sprintf(buf, "nFreeChunks........ %d\n", dev->nFreeChunks); + buf += sprintf(buf, "n_tnodes............. %d\n", dev->n_tnodes); + buf += sprintf(buf, "n_obj................ %d\n", dev->n_obj); + buf += sprintf(buf, "n_free_chunks........ %d\n", dev->n_free_chunks); buf += sprintf(buf, "\n"); - buf += sprintf(buf, "nPageWrites........ %u\n", dev->nPageWrites); - buf += sprintf(buf, "nPageReads......... %u\n", dev->nPageReads); - buf += sprintf(buf, "nBlockErasures..... %u\n", dev->nBlockErasures); - buf += sprintf(buf, "nGCCopies.......... %u\n", dev->nGCCopies); - buf += sprintf(buf, "allGCs............. %u\n", dev->allGCs); - buf += sprintf(buf, "passiveGCs......... %u\n", dev->passiveGCs); - buf += sprintf(buf, "oldestDirtyGCs..... %u\n", dev->oldestDirtyGCs); - buf += sprintf(buf, "nGCBlocks.......... %u\n", dev->nGCBlocks); - buf += sprintf(buf, "backgroundGCs...... %u\n", dev->backgroundGCs); - buf += sprintf(buf, "nRetriedWrites..... %u\n", dev->nRetriedWrites); - buf += sprintf(buf, "nRetireBlocks...... %u\n", dev->nRetiredBlocks); - buf += sprintf(buf, "eccFixed........... %u\n", dev->eccFixed); - buf += sprintf(buf, "eccUnfixed......... %u\n", dev->eccUnfixed); - buf += sprintf(buf, "tagsEccFixed....... %u\n", dev->tagsEccFixed); - buf += sprintf(buf, "tagsEccUnfixed..... %u\n", dev->tagsEccUnfixed); - buf += sprintf(buf, "cacheHits.......... %u\n", dev->cacheHits); - buf += sprintf(buf, "nDeletedFiles...... %u\n", dev->nDeletedFiles); - buf += sprintf(buf, "nUnlinkedFiles..... %u\n", dev->nUnlinkedFiles); - buf += sprintf(buf, "refreshCount....... %u\n", dev->refreshCount); - buf += - sprintf(buf, "nBackgroudDeletions %u\n", dev->nBackgroundDeletions); + buf += sprintf(buf, "n_page_writes........ %u\n", dev->n_page_writes); + buf += sprintf(buf, "n_page_reads......... %u\n", dev->n_page_reads); + buf += sprintf(buf, "n_erasures........... %u\n", dev->n_erasures); + buf += sprintf(buf, "n_gc_copies.......... %u\n", dev->n_gc_copies); + buf += sprintf(buf, "all_gcs.............. %u\n", dev->all_gcs); + buf += sprintf(buf, "passive_gc_count..... %u\n", dev->passive_gc_count); + buf += sprintf(buf, "oldest_dirty_gc_count %u\n", dev->oldest_dirty_gc_count); + buf += sprintf(buf, "n_gc_blocks.......... %u\n", dev->n_gc_blocks); + buf += sprintf(buf, "bg_gcs............... %u\n", dev->bg_gcs); + buf += sprintf(buf, "n_retired_writes..... %u\n", dev->n_retired_writes); + buf += sprintf(buf, "n_retired_blocks..... %u\n", dev->n_retired_blocks); + buf += sprintf(buf, "n_ecc_fixed.......... %u\n", dev->n_ecc_fixed); + buf += sprintf(buf, "n_ecc_unfixed........ %u\n", dev->n_ecc_unfixed); + buf += sprintf(buf, "n_tags_ecc_fixed..... %u\n", dev->n_tags_ecc_fixed); + buf += sprintf(buf, "n_tags_ecc_unfixed... %u\n", dev->n_tags_ecc_unfixed); + buf += sprintf(buf, "cache_hits........... %u\n", dev->cache_hits); + buf += sprintf(buf, "n_deleted_files...... %u\n", dev->n_deleted_files); + buf += sprintf(buf, "n_unlinked_files..... %u\n", dev->n_unlinked_files); + buf += sprintf(buf, "refresh_count........ %u\n", dev->refresh_count); + buf += sprintf(buf, "n_bg_deletions....... %u\n", dev->n_bg_deletions); return buf; } @@ -3254,7 +3260,7 @@ static int yaffs_proc_read(char *page, int n = 0; /* Get proc_file_read() to step 'offset' by one on each sucessive call. - * We use 'offset' (*ppos) to indicate where we are in devList. + * We use 'offset' (*ppos) to indicate where we are in dev_list. * This also assumes the user has posted a read buffer large * enough to hold the complete output; but that's life in /proc. */ @@ -3273,8 +3279,8 @@ static int yaffs_proc_read(char *page, /* Locate and print the Nth entry. Order N-squared but N is small. */ ylist_for_each(item, &yaffs_context_list) { - struct yaffs_LinuxContext *dc = ylist_entry(item, struct yaffs_LinuxContext, contextList); - yaffs_Device *dev = dc->dev; + struct yaffs_linux_context *dc = ylist_entry(item, struct yaffs_linux_context, context_list); + struct yaffs_dev *dev = dc->dev; if (n < (step & ~1)) { n+=2; @@ -3306,17 +3312,17 @@ static int yaffs_stats_proc_read(char *page, /* Locate and print the Nth entry. Order N-squared but N is small. */ ylist_for_each(item, &yaffs_context_list) { - struct yaffs_LinuxContext *dc = ylist_entry(item, struct yaffs_LinuxContext, contextList); - yaffs_Device *dev = dc->dev; + struct yaffs_linux_context *dc = ylist_entry(item, struct yaffs_linux_context, context_list); + struct yaffs_dev *dev = dc->dev; - int erasedChunks; + int erased_chunks; - erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock; + erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block; buf += sprintf(buf,"%d, %d, %d, %u, %u, %u, %u\n", - n, dev->nFreeChunks, erasedChunks, - dev->backgroundGCs, dev->oldestDirtyGCs, - dev->nObjects, dev->nTnodes); + n, dev->n_free_chunks, erased_chunks, + dev->bg_gcs, dev->oldest_dirty_gc_count, + dev->n_obj, dev->n_tnodes); } up(&yaffs_context_lock);