X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs_multi.c;h=1d9ca00717a5ae7ecd0b69afcab24ce041c48d48;hp=6e2f8f8a963d89c018d82a41e77cb98fcc5f47cb;hb=a32621e0d7f5f391e9152cfe710fa6c99ca44c50;hpb=a233a8fc212a32a50cc5f572cd4946e91cc9ca93 diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c index 6e2f8f8..1d9ca00 100644 --- a/yaffs_vfs_multi.c +++ b/yaffs_vfs_multi.c @@ -151,7 +151,7 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) { uint64_t result = partition_size; do_div(result, block_size); - return (uint32_t)result; + return (uint32_t) result; } #else #define YCALCBLOCKS(s, b) ((s)/(b)) @@ -219,15 +219,14 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino); #define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->u.generic_sbp) #endif - #define update_dir_time(dir) do {\ (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \ } while(0) - + static void yaffs_put_super(struct super_block *sb); static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, - loff_t *pos); + loff_t * pos); static ssize_t yaffs_hold_space(struct file *f); static void yaffs_release_space(struct file *f); @@ -241,7 +240,7 @@ static int yaffs_file_flush(struct file *file); static int yaffs_sync_object(struct file *file, int datasync); #else static int yaffs_sync_object(struct file *file, struct dentry *dentry, - int datasync); + int datasync); #endif static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir); @@ -250,24 +249,24 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir); static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *n); static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, - struct nameidata *n); + struct nameidata *n); #else static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode); static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry); #endif static int yaffs_link(struct dentry *old_dentry, struct inode *dir, - struct dentry *dentry); + struct dentry *dentry); static int yaffs_unlink(struct inode *dir, struct dentry *dentry); static int yaffs_symlink(struct inode *dir, struct dentry *dentry, - const char *symname); + const char *symname); static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode); #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, - dev_t dev); + dev_t dev); #else static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, - int dev); + int dev); #endif static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry); @@ -309,31 +308,30 @@ static int yaffs_writepage(struct page *page); #ifdef CONFIG_YAFFS_XATTR int yaffs_setxattr(struct dentry *dentry, const char *name, - const void *value, size_t size, int flags); + const void *value, size_t size, int flags); ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, void *buff, - size_t size); + size_t size); int yaffs_removexattr(struct dentry *dentry, const char *name); ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size); #endif - #if (YAFFS_USE_WRITE_BEGIN_END != 0) static int yaffs_write_begin(struct file *filp, struct address_space *mapping, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata); + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata); static int yaffs_write_end(struct file *filp, struct address_space *mapping, - loff_t pos, unsigned len, unsigned copied, - struct page *pg, void *fsdadata); + loff_t pos, unsigned len, unsigned copied, + struct page *pg, void *fsdadata); #else static int yaffs_prepare_write(struct file *f, struct page *pg, - unsigned offset, unsigned to); + unsigned offset, unsigned to); static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, - unsigned to); + unsigned to); #endif -static int yaffs_readlink(struct dentry *dentry, char __user *buffer, - int buflen); +static int yaffs_readlink(struct dentry *dentry, char __user * buffer, + int buflen); #if (YAFFS_NEW_FOLLOW_LINK == 1) void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias); static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); @@ -347,7 +345,6 @@ static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin); static int yaffs_vfs_setattr(struct inode *, struct iattr *); - static struct address_space_operations yaffs_file_address_operations = { .readpage = yaffs_readpage, .writepage = yaffs_writepage, @@ -360,7 +357,6 @@ static struct address_space_operations yaffs_file_address_operations = { #endif }; - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) static const struct file_operations yaffs_file_operations = { .read = do_sync_read, @@ -405,14 +401,13 @@ static const struct file_operations yaffs_file_operations = { #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) static void zero_user_segment(struct page *page, unsigned start, unsigned end) { - void * kaddr = kmap_atomic(page, KM_USER0); + void *kaddr = kmap_atomic(page, KM_USER0); memset(kaddr + start, 0, end - start); kunmap_atomic(kaddr, KM_USER0); flush_dcache_page(page); } #endif - static const struct inode_operations yaffs_file_inode_operations = { .setattr = yaffs_setattr, #ifdef CONFIG_YAFFS_XATTR @@ -484,11 +479,10 @@ static const struct super_operations yaffs_super_ops = { .write_super = yaffs_write_super, }; - -static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) +static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) { #ifdef YAFFS_USE_SETATTR_COPY - setattr_copy(inode,attr); + setattr_copy(inode, attr); return 0; #else return inode_setattr(inode, attr); @@ -496,13 +490,13 @@ static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) } -static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) +static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) { #ifdef YAFFS_USE_TRUNCATE_SETSIZE - truncate_setsize(inode,newsize); + truncate_setsize(inode, newsize); return 0; #else - truncate_inode_pages(&inode->i_data,newsize); + truncate_inode_pages(&inode->i_data, newsize); return 0; #endif @@ -512,38 +506,42 @@ static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev) { return yaffs_gc_control; } - + 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)->gross_lock)); + mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock)); T(YAFFS_TRACE_LOCK, (TSTR("yaffs locked %p\n"), current)); } 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)->gross_lock)); + mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock)); } #ifdef YAFFS_COMPILE_EXPORTFS -static struct inode * -yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino, uint32_t generation) +static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino, + uint32_t generation) { return Y_IGET(sb, ino); } -static struct dentry * -yaffs2_fh_to_dentry(struct super_block *sb, struct fid *fid, int fh_len, int fh_type) +static struct dentry *yaffs2_fh_to_dentry(struct super_block *sb, + struct fid *fid, int fh_len, + int fh_type) { - return generic_fh_to_dentry(sb, fid, fh_len, fh_type, yaffs2_nfs_get_inode) ; + return generic_fh_to_dentry(sb, fid, fh_len, fh_type, + yaffs2_nfs_get_inode); } -static struct dentry * - yaffs2_fh_to_parent(struct super_block *sb, struct fid *fid, int fh_len, int fh_type) +static struct dentry *yaffs2_fh_to_parent(struct super_block *sb, + struct fid *fid, int fh_len, + int fh_type) { - return generic_fh_to_parent(sb, fid, fh_len, fh_type, yaffs2_nfs_get_inode); + return generic_fh_to_parent(sb, fid, fh_len, fh_type, + yaffs2_nfs_get_inode); } struct dentry *yaffs2_get_parent(struct dentry *dentry) @@ -583,12 +581,11 @@ struct dentry *yaffs2_get_parent(struct dentry *dentry) * using the default functions of exportfs. */ -static struct export_operations yaffs_export_ops = -{ +static struct export_operations yaffs_export_ops = { .fh_to_dentry = yaffs2_fh_to_dentry, .fh_to_parent = yaffs2_fh_to_parent, .get_parent = yaffs2_get_parent, -} ; +}; #endif @@ -624,21 +621,22 @@ struct yaffs_search_context { * * Called at start of readdir. */ -static struct yaffs_search_context * yaffs_new_search(struct yaffs_obj *dir) +static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir) { struct yaffs_dev *dev = dir->my_dev; - struct yaffs_search_context *sc = YMALLOC(sizeof(struct yaffs_search_context)); - if(sc){ + struct yaffs_search_context *sc = + YMALLOC(sizeof(struct yaffs_search_context)); + if (sc) { sc->dir_obj = dir; sc->dev = dev; - if( list_empty(&sc->dir_obj->variant.dir_variant.children)) + if (list_empty(&sc->dir_obj->variant.dir_variant.children)) sc->next_return = NULL; else - sc->next_return = list_entry( - dir->variant.dir_variant.children.next, - struct yaffs_obj,siblings); + sc->next_return = + list_entry(dir->variant.dir_variant.children.next, + struct yaffs_obj, siblings); INIT_LIST_HEAD(&sc->others); - list_add(&sc->others,&(yaffs_dev_to_lc(dev)->search_contexts)); + list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts)); } return sc; } @@ -646,9 +644,9 @@ static struct yaffs_search_context * yaffs_new_search(struct yaffs_obj *dir) /* * yaffs_search_end() disposes of a search context and cleans up. */ -static void yaffs_search_end(struct yaffs_search_context * sc) +static void yaffs_search_end(struct yaffs_search_context *sc) { - if(sc){ + if (sc) { list_del(&sc->others); YFREE(sc); } @@ -661,20 +659,21 @@ static void yaffs_search_end(struct yaffs_search_context * sc) */ static void yaffs_search_advance(struct yaffs_search_context *sc) { - if(!sc) - return; + if (!sc) + return; - if( sc->next_return == NULL || - list_empty(&sc->dir_obj->variant.dir_variant.children)) - sc->next_return = NULL; - else { - struct list_head *next = sc->next_return->siblings.next; + if (sc->next_return == NULL || + list_empty(&sc->dir_obj->variant.dir_variant.children)) + sc->next_return = NULL; + else { + struct list_head *next = sc->next_return->siblings.next; - if( next == &sc->dir_obj->variant.dir_variant.children) - sc->next_return = NULL; /* end of list */ - else - sc->next_return = list_entry(next,struct yaffs_obj,siblings); - } + if (next == &sc->dir_obj->variant.dir_variant.children) + sc->next_return = NULL; /* end of list */ + else + sc->next_return = + list_entry(next, struct yaffs_obj, siblings); + } } /* @@ -685,30 +684,29 @@ static void yaffs_search_advance(struct yaffs_search_context *sc) static void yaffs_remove_obj_callback(struct yaffs_obj *obj) { - struct list_head *i; - struct yaffs_search_context *sc; - struct list_head *search_contexts = &(yaffs_dev_to_lc(obj->my_dev)->search_contexts); - + struct list_head *i; + struct yaffs_search_context *sc; + struct list_head *search_contexts = + &(yaffs_dev_to_lc(obj->my_dev)->search_contexts); - /* Iterate through the directory search contexts. - * If any are currently on the object being removed, then advance - * the search context to the next object to prevent a hanging pointer. - */ - list_for_each(i, search_contexts) { - if (i) { - sc = list_entry(i, struct yaffs_search_context,others); - if(sc->next_return == obj) - yaffs_search_advance(sc); - } + /* Iterate through the directory search contexts. + * If any are currently on the object being removed, then advance + * the search context to the next object to prevent a hanging pointer. + */ + list_for_each(i, search_contexts) { + if (i) { + sc = list_entry(i, struct yaffs_search_context, others); + if (sc->next_return == obj) + yaffs_search_advance(sc); + } } } - /*-----------------------------------------------------------------*/ -static int yaffs_readlink(struct dentry *dentry, char __user *buffer, - int buflen) +static int yaffs_readlink(struct dentry *dentry, char __user * buffer, + int buflen) { unsigned char *alias; int ret; @@ -751,32 +749,32 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) ret_int = -ENOMEM; goto out; } - #if (YAFFS_NEW_FOLLOW_LINK == 1) nd_set_link(nd, alias); ret = alias; out: - if(ret_int) + if (ret_int) ret = ERR_PTR(ret_int); return ret; #else ret = vfs_follow_link(nd, alias); kfree(alias); out: - if(ret_int) + if (ret_int) ret = ret_int; return ret; #endif } #if (YAFFS_NEW_FOLLOW_LINK == 1) -void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) { +void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) +{ kfree(alias); } #endif struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, - struct yaffs_obj *obj); + struct yaffs_obj *obj); /* * Lookup is used to find objects in the fs @@ -784,7 +782,7 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, - struct nameidata *n) + struct nameidata *n) #else static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) #endif @@ -794,31 +792,29 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev; - if(current != yaffs_dev_to_lc(dev)->readdir_process) + 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_inode_to_obj(dir)->obj_id, dentry->d_name.name)); + (TSTR("yaffs_lookup for %d:%s\n"), + yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name)); - obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), - dentry->d_name.name); + 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)->readdir_process) + 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->obj_id)); + (TSTR("yaffs_lookup found %d\n"), obj->obj_id)); inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); if (inode) { - T(YAFFS_TRACE_OS, - (TSTR("yaffs_loookup dentry \n"))); + T(YAFFS_TRACE_OS, (TSTR("yaffs_loookup dentry \n"))); /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to * d_add even if NULL inode */ #if 0 @@ -831,7 +827,7 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) } } else { - T(YAFFS_TRACE_OS,(TSTR("yaffs_lookup not found\n"))); + T(YAFFS_TRACE_OS, (TSTR("yaffs_lookup not found\n"))); } @@ -842,7 +838,6 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) return NULL; } - #ifdef YAFFS_HAS_PUT_INODE /* For now put inode is just for debugging @@ -851,13 +846,12 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) static void yaffs_put_inode(struct inode *inode) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_put_inode: ino %d, count %d\n"), (int)inode->i_ino, - atomic_read(&inode->i_count))); + (TSTR("yaffs_put_inode: ino %d, count %d\n"), (int)inode->i_ino, + atomic_read(&inode->i_count))); } #endif - static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj) { /* Clear the association between the inode and @@ -878,7 +872,7 @@ static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj) * yaffs_clear_inode() and yaffs_delete_inode() * */ -static void yaffs_evict_inode( struct inode *inode) +static void yaffs_evict_inode(struct inode *inode) { struct yaffs_obj *obj; struct yaffs_dev *dev; @@ -887,16 +881,16 @@ static void yaffs_evict_inode( struct inode *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, - atomic_read(&inode->i_count), - obj ? "object exists" : "null object")); + (TSTR("yaffs_evict_inode: ino %d, count %d %s\n"), (int)inode->i_ino, + atomic_read(&inode->i_count), + obj ? "object exists" : "null object")); if (!inode->i_nlink && !is_bad_inode(inode)) deleteme = 1; - truncate_inode_pages(&inode->i_data,0); + truncate_inode_pages(&inode->i_data, 0); end_writeback(inode); - if(deleteme && obj){ + if (deleteme && obj) { dev = obj->my_dev; yaffs_gross_lock(dev); yaffs_del_obj(obj); @@ -905,11 +899,10 @@ static void yaffs_evict_inode( struct inode *inode) if (obj) { dev = obj->my_dev; yaffs_gross_lock(dev); - yaffs_unstitch_obj(inode,obj); + yaffs_unstitch_obj(inode, obj); yaffs_gross_unlock(dev); } - } #else @@ -928,14 +921,14 @@ static void yaffs_clear_inode(struct inode *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, - atomic_read(&inode->i_count), - obj ? "object exists" : "null object")); + (TSTR("yaffs_clear_inode: ino %d, count %d %s\n"), (int)inode->i_ino, + atomic_read(&inode->i_count), + obj ? "object exists" : "null object")); if (obj) { dev = obj->my_dev; yaffs_gross_lock(dev); - yaffs_unstitch_obj(inode,obj); + yaffs_unstitch_obj(inode, obj); yaffs_gross_unlock(dev); } @@ -952,9 +945,9 @@ static void yaffs_delete_inode(struct inode *inode) struct yaffs_dev *dev; T(YAFFS_TRACE_OS, - (TSTR("yaffs_delete_inode: ino %d, count %d %s\n"), (int)inode->i_ino, - atomic_read(&inode->i_count), - obj ? "object exists" : "null object")); + (TSTR("yaffs_delete_inode: ino %d, count %d %s\n"), (int)inode->i_ino, + atomic_read(&inode->i_count), + obj ? "object exists" : "null object")); if (obj) { dev = obj->my_dev; @@ -969,7 +962,6 @@ static void yaffs_delete_inode(struct inode *inode) } #endif - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) static int yaffs_file_flush(struct file *file, fl_owner_t id) #else @@ -981,8 +973,8 @@ static int yaffs_file_flush(struct file *file) struct yaffs_dev *dev = obj->my_dev; T(YAFFS_TRACE_OS, - (TSTR("yaffs_file_flush object %d (%s)\n"), obj->obj_id, - obj->dirty ? "dirty" : "clean")); + (TSTR("yaffs_file_flush object %d (%s)\n"), obj->obj_id, + obj->dirty ? "dirty" : "clean")); yaffs_gross_lock(dev); @@ -1004,9 +996,9 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) struct yaffs_dev *dev; T(YAFFS_TRACE_OS, - (TSTR("yaffs_readpage_nolock at %08x, size %08x\n"), - (unsigned)(pg->index << PAGE_CACHE_SHIFT), - (unsigned)PAGE_CACHE_SIZE)); + (TSTR("yaffs_readpage_nolock at %08x, size %08x\n"), + (unsigned)(pg->index << PAGE_CACHE_SHIFT), + (unsigned)PAGE_CACHE_SIZE)); obj = yaffs_dentry_to_obj(f->f_dentry); @@ -1025,8 +1017,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) yaffs_gross_lock(dev); ret = yaffs_file_rd(obj, pg_buf, - pg->index << PAGE_CACHE_SHIFT, - PAGE_CACHE_SIZE); + pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE); yaffs_gross_unlock(dev); @@ -1060,7 +1051,7 @@ static int yaffs_readpage(struct file *f, struct page *pg) int ret; T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage\n"))); - ret=yaffs_readpage_unlock(f, pg); + ret = yaffs_readpage_unlock(f, pg); T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage done\n"))); return ret; } @@ -1092,20 +1083,21 @@ static int yaffs_writepage(struct page *page) end_index = i_size >> PAGE_CACHE_SHIFT; - if(page->index < end_index) + if (page->index < end_index) n_bytes = PAGE_CACHE_SIZE; else { - n_bytes = i_size & (PAGE_CACHE_SIZE -1); + n_bytes = i_size & (PAGE_CACHE_SIZE - 1); 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), - (unsigned)inode->i_size)); + (TSTR + ("yaffs_writepage at %08x, inode size = %08x!!!\n"), + (unsigned)(page->index << PAGE_CACHE_SHIFT), + (unsigned)inode->i_size)); T(YAFFS_TRACE_OS, - (TSTR(" -> don't care!!\n"))); + (TSTR(" -> don't care!!\n"))); - zero_user_segment(page,0,PAGE_CACHE_SIZE); + zero_user_segment(page, 0, PAGE_CACHE_SIZE); set_page_writeback(page); unlock_page(page); end_page_writeback(page); @@ -1113,8 +1105,8 @@ static int yaffs_writepage(struct page *page) } } - if(n_bytes != PAGE_CACHE_SIZE) - zero_user_segment(page,n_bytes,PAGE_CACHE_SIZE); + if (n_bytes != PAGE_CACHE_SIZE) + zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE); get_page(page); @@ -1125,20 +1117,20 @@ static int yaffs_writepage(struct page *page) yaffs_gross_lock(dev); T(YAFFS_TRACE_OS, - (TSTR("yaffs_writepage at %08x, size %08x\n"), - (unsigned)(page->index << PAGE_CACHE_SHIFT), n_bytes)); + (TSTR("yaffs_writepage at %08x, size %08x\n"), + (unsigned)(page->index << PAGE_CACHE_SHIFT), n_bytes)); T(YAFFS_TRACE_OS, - (TSTR("writepag0: obj = %05x, ino = %05x\n"), - (int)obj->variant.file_variant.file_size, (int)inode->i_size)); + (TSTR("writepag0: obj = %05x, ino = %05x\n"), + (int)obj->variant.file_variant.file_size, (int)inode->i_size)); n_written = yaffs_wr_file(obj, buffer, - page->index << PAGE_CACHE_SHIFT, n_bytes, 0); + 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.file_variant.file_size, (int)inode->i_size)); + (TSTR("writepag1: obj = %05x, ino = %05x\n"), + (int)obj->variant.file_variant.file_size, (int)inode->i_size)); yaffs_gross_unlock(dev); @@ -1151,11 +1143,10 @@ static int yaffs_writepage(struct page *page) return (n_written == n_bytes) ? 0 : -ENOSPC; } - #if (YAFFS_USE_WRITE_BEGIN_END > 0) static int yaffs_write_begin(struct file *filp, struct address_space *mapping, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata) + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata) { struct page *pg = NULL; pgoff_t index = pos >> PAGE_CACHE_SHIFT; @@ -1172,12 +1163,12 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping, *pagep = pg; if (!pg) { - ret = -ENOMEM; + ret = -ENOMEM; goto out; } T(YAFFS_TRACE_OS, - (TSTR("start yaffs_write_begin index %d(%x) uptodate %d\n"), - (int)index,(int)index,Page_Uptodate(pg) ? 1 : 0)); + (TSTR("start yaffs_write_begin index %d(%x) uptodate %d\n"), + (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0)); /* Get fs space */ space_held = yaffs_hold_space(filp); @@ -1202,7 +1193,7 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping, out: T(YAFFS_TRACE_OS, - (TSTR("end yaffs_write_begin fail returning %d\n"), ret)); + (TSTR("end yaffs_write_begin fail returning %d\n"), ret)); if (space_held) yaffs_release_space(filp); if (pg) { @@ -1215,7 +1206,7 @@ out: #else static int yaffs_prepare_write(struct file *f, struct page *pg, - unsigned offset, unsigned to) + unsigned offset, unsigned to) { T(YAFFS_TRACE_OS, (TSTR("yaffs_prepair_write\n"))); @@ -1227,8 +1218,8 @@ static int yaffs_prepare_write(struct file *f, struct page *pg, #if (YAFFS_USE_WRITE_BEGIN_END > 0) static int yaffs_write_end(struct file *filp, struct address_space *mapping, - loff_t pos, unsigned len, unsigned copied, - struct page *pg, void *fsdadata) + loff_t pos, unsigned len, unsigned copied, + struct page *pg, void *fsdadata) { int ret = 0; void *addr, *kva; @@ -1238,15 +1229,15 @@ 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 n_bytes %d\n", - addr,(unsigned)pos, copied)); + ("yaffs_write_end addr %p pos %x n_bytes %d\n", + addr, (unsigned)pos, copied)); ret = yaffs_file_write(filp, addr, copied, &pos); if (ret != copied) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_write_end not same size ret %d copied %d\n"), - ret, copied)); + (TSTR("yaffs_write_end not same size ret %d copied %d\n"), + ret, copied)); SetPageError(pg); } else { /* Nothing */ @@ -1262,7 +1253,7 @@ static int yaffs_write_end(struct file *filp, struct address_space *mapping, #else static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, - unsigned to) + unsigned to) { void *addr, *kva; @@ -1276,18 +1267,19 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, kva = kmap(pg); addr = kva + offset; - saddr = (unsigned) addr; + saddr = (unsigned)addr; T(YAFFS_TRACE_OS, - (TSTR("yaffs_commit_write addr %x pos %x n_bytes %d\n"), - saddr, spos, n_bytes)); + (TSTR("yaffs_commit_write addr %x pos %x n_bytes %d\n"), + saddr, spos, n_bytes)); n_written = yaffs_file_write(f, addr, n_bytes, &pos); if (n_written != n_bytes) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_commit_write not same size n_written %d n_bytes %d\n"), - n_written, n_bytes)); + (TSTR + ("yaffs_commit_write not same size n_written %d n_bytes %d\n"), + n_written, n_bytes)); SetPageError(pg); } else { /* Nothing */ @@ -1296,19 +1288,18 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, kunmap(pg); T(YAFFS_TRACE_OS, - (TSTR("yaffs_commit_write returning %d\n"), - n_written == n_bytes ? 0 : n_written)); + (TSTR("yaffs_commit_write returning %d\n"), + n_written == n_bytes ? 0 : n_written)); return n_written == n_bytes ? 0 : n_written; } #endif - -static void yaffs_fill_inode_from_obj(struct inode *inode, struct yaffs_obj *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->variant_type) { @@ -1371,25 +1362,26 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, struct yaffs_obj *obj inode->i_nlink = yaffs_get_obj_link_count(obj); T(YAFFS_TRACE_OS, - (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))); + (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))); switch (obj->yst_mode & S_IFMT) { default: /* fifo, device or socket */ #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) init_special_inode(inode, obj->yst_mode, - old_decode_dev(obj->yst_rdev)); + old_decode_dev(obj->yst_rdev)); #else init_special_inode(inode, obj->yst_mode, - (dev_t) (obj->yst_rdev)); + (dev_t) (obj->yst_rdev)); #endif break; case S_IFREG: /* file */ inode->i_op = &yaffs_file_inode_operations; inode->i_fop = &yaffs_file_operations; inode->i_mapping->a_ops = - &yaffs_file_address_operations; + &yaffs_file_address_operations; break; case S_IFDIR: /* directory */ inode->i_op = &yaffs_dir_inode_operations; @@ -1406,32 +1398,32 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, struct yaffs_obj *obj } else { T(YAFFS_TRACE_OS, - (TSTR("yaffs_fill_inode invalid parameters\n"))); + (TSTR("yaffs_fill_inode invalid parameters\n"))); } } struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, - struct yaffs_obj *obj) + struct yaffs_obj *obj) { struct inode *inode; if (!sb) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_get_inode for NULL super_block!!\n"))); + (TSTR("yaffs_get_inode for NULL super_block!!\n"))); return NULL; } if (!obj) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_get_inode for NULL object!!\n"))); + (TSTR("yaffs_get_inode for NULL object!!\n"))); return NULL; } T(YAFFS_TRACE_OS, - (TSTR("yaffs_get_inode for object %d\n"), obj->obj_id)); + (TSTR("yaffs_get_inode for object %d\n"), obj->obj_id)); inode = Y_IGET(sb, obj->obj_id); if (IS_ERR(inode)) @@ -1445,7 +1437,7 @@ 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) + loff_t * pos) { struct yaffs_obj *obj; int n_written, ipos; @@ -1467,20 +1459,20 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, if (!obj) T(YAFFS_TRACE_OS, - (TSTR("yaffs_file_write: hey obj is null!\n"))); + (TSTR("yaffs_file_write: hey obj is null!\n"))); else T(YAFFS_TRACE_OS, - (TSTR("yaffs_file_write about to write writing %u(%x) bytes" + (TSTR("yaffs_file_write about to write writing %u(%x) bytes" "to object %d at %d(%x)\n"), - (unsigned) n, (unsigned) n, obj->obj_id, ipos,ipos)); + (unsigned)n, (unsigned)n, obj->obj_id, ipos, ipos)); n_written = yaffs_wr_file(obj, buf, ipos, n, 0); yaffs_touch_super(dev); T(YAFFS_TRACE_OS, - (TSTR("yaffs_file_write: %d(%x) bytes written\n"), - (unsigned )n,(unsigned)n)); + (TSTR("yaffs_file_write: %d(%x) bytes written\n"), + (unsigned)n, (unsigned)n)); if (n_written > 0) { ipos += n_written; @@ -1490,9 +1482,8 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, inode->i_blocks = (ipos + 511) >> 9; T(YAFFS_TRACE_OS, - (TSTR("yaffs_file_write size updated to %d bytes, " - "%d blocks\n"), - ipos, (int)(inode->i_blocks))); + (TSTR("yaffs_file_write size updated to %d bytes, " + "%d blocks\n"), ipos, (int)(inode->i_blocks))); } } @@ -1511,7 +1502,6 @@ static ssize_t yaffs_hold_space(struct file *f) int n_free_chunks; - obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->my_dev; @@ -1530,25 +1520,22 @@ static void yaffs_release_space(struct file *f) struct yaffs_obj *obj; struct yaffs_dev *dev; - obj = yaffs_dentry_to_obj(f->f_dentry); dev = obj->my_dev; yaffs_gross_lock(dev); - yaffs_gross_unlock(dev); } - static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin) { long long retval; lock_kernel(); - switch (origin){ + switch (origin) { case 2: offset += i_size_read(file->f_path.dentry->d_inode); break; @@ -1557,7 +1544,7 @@ static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin) } retval = -EINVAL; - if (offset >= 0){ + if (offset >= 0) { if (offset != file->f_pos) file->f_pos = offset; @@ -1567,16 +1554,15 @@ static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin) return retval; } - static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) { struct yaffs_obj *obj; struct yaffs_dev *dev; - struct yaffs_search_context *sc; + struct yaffs_search_context *sc; struct inode *inode = f->f_dentry->d_inode; unsigned long offset, curoffs; struct yaffs_obj *l; - int ret_val = 0; + int ret_val = 0; char name[YAFFS_MAX_NAME_LENGTH + 1]; @@ -1589,20 +1575,21 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) offset = f->f_pos; - sc = yaffs_new_search(obj); - if(!sc){ - ret_val = -ENOMEM; - goto out; - } + sc = yaffs_new_search(obj); + if (!sc) { + ret_val = -ENOMEM; + goto out; + } - T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: starting at %d\n"), (int)offset)); + T(YAFFS_TRACE_OS, + (TSTR("yaffs_readdir: starting at %d\n"), (int)offset)); if (offset == 0) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_readdir: entry . ino %d \n"), - (int)inode->i_ino)); + (TSTR("yaffs_readdir: entry . ino %d \n"), + (int)inode->i_ino)); yaffs_gross_unlock(dev); - if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0){ + if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0) { yaffs_gross_lock(dev); goto out; } @@ -1612,11 +1599,12 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) } if (offset == 1) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_readdir: entry .. ino %d \n"), - (int)f->f_dentry->d_parent->d_inode->i_ino)); + (TSTR("yaffs_readdir: entry .. ino %d \n"), + (int)f->f_dentry->d_parent->d_inode->i_ino)); yaffs_gross_unlock(dev); if (filldir(dirent, "..", 2, offset, - f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0){ + f->f_dentry->d_parent->d_inode->i_ino, + DT_DIR) < 0) { yaffs_gross_lock(dev); goto out; } @@ -1635,37 +1623,34 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) f->f_version = inode->i_version; } - while(sc->next_return){ + while (sc->next_return) { curoffs++; - l = sc->next_return; + l = sc->next_return; if (curoffs >= offset) { - int this_inode = yaffs_get_obj_inode(l); - int this_type = yaffs_get_obj_type(l); + int this_inode = yaffs_get_obj_inode(l); + int this_type = yaffs_get_obj_type(l); - yaffs_get_obj_name(l, name, - YAFFS_MAX_NAME_LENGTH + 1); + yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1); T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: %s inode %d\n"), - name, yaffs_get_obj_inode(l))); + name, yaffs_get_obj_inode(l))); - yaffs_gross_unlock(dev); + yaffs_gross_unlock(dev); if (filldir(dirent, - name, - strlen(name), - offset, - this_inode, - this_type) < 0){ + name, + strlen(name), + offset, this_inode, this_type) < 0) { yaffs_gross_lock(dev); goto out; } - yaffs_gross_lock(dev); + yaffs_gross_lock(dev); offset++; f->f_pos++; } - yaffs_search_advance(sc); + yaffs_search_advance(sc); } out: @@ -1676,8 +1661,6 @@ out: return ret_val; } - - /* * File creation. Allocate an inode, and we're done.. */ @@ -1690,10 +1673,10 @@ out: #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, - dev_t rdev) + dev_t rdev) #else static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, - int rdev) + int rdev) #endif { struct inode *inode; @@ -1705,24 +1688,25 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int error = -ENOSPC; uid_t uid = YCRED(current)->fsuid; - gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; + gid_t gid = + (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; if ((dir->i_mode & S_ISGID) && S_ISDIR(mode)) mode |= S_ISGID; if (parent) { T(YAFFS_TRACE_OS, - (TSTR("yaffs_mknod: parent object %d type %d\n"), - parent->obj_id, parent->variant_type)); + (TSTR("yaffs_mknod: parent object %d type %d\n"), + parent->obj_id, parent->variant_type)); } else { T(YAFFS_TRACE_OS, - (TSTR("yaffs_mknod: could not get parent object\n"))); + (TSTR("yaffs_mknod: could not get parent object\n"))); return -EPERM; } T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making oject for %s, " - "mode %x dev %x\n"), - dentry->d_name.name, mode, rdev)); + "mode %x dev %x\n"), + dentry->d_name.name, mode, rdev)); dev = parent->my_dev; @@ -1733,23 +1717,24 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, /* 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_create_special(parent, dentry->d_name.name, mode, uid, - gid, old_encode_dev(rdev)); + obj = + yaffs_create_special(parent, dentry->d_name.name, mode, uid, + gid, old_encode_dev(rdev)); #else - obj = yaffs_create_special(parent, dentry->d_name.name, mode, uid, - gid, rdev); + 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_create_file(parent, dentry->d_name.name, mode, uid, - gid); + gid); break; case S_IFDIR: /* directory */ - T(YAFFS_TRACE_OS, - (TSTR("yaffs_mknod: making directory\n"))); + T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making directory\n"))); obj = yaffs_create_dir(parent, dentry->d_name.name, mode, - uid, gid); + uid, gid); break; case S_IFLNK: /* symlink */ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making symlink\n"))); @@ -1765,13 +1750,12 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, d_instantiate(dentry, inode); update_dir_time(dir); T(YAFFS_TRACE_OS, - (TSTR("yaffs_mknod created object %d count = %d\n"), - obj->obj_id, atomic_read(&inode->i_count))); + (TSTR("yaffs_mknod created object %d count = %d\n"), + obj->obj_id, atomic_read(&inode->i_count))); error = 0; - yaffs_fill_inode_from_obj(dir,parent); + yaffs_fill_inode_from_obj(dir, parent); } else { - T(YAFFS_TRACE_OS, - (TSTR("yaffs_mknod failed making object\n"))); + T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod failed making object\n"))); error = -ENOMEM; } @@ -1793,7 +1777,7 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) #endif { - T(YAFFS_TRACE_OS,(TSTR("yaffs_create\n"))); + T(YAFFS_TRACE_OS, (TSTR("yaffs_create\n"))); return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); } @@ -1805,9 +1789,8 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry) struct yaffs_obj *obj; T(YAFFS_TRACE_OS, - (TSTR("yaffs_unlink %d:%s\n"), - (int)(dir->i_ino), - dentry->d_name.name)); + (TSTR("yaffs_unlink %d:%s\n"), + (int)(dir->i_ino), dentry->d_name.name)); obj = yaffs_inode_to_obj(dir); dev = obj->my_dev; @@ -1831,7 +1814,7 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry) * Create a link... */ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, - struct dentry *dentry) + struct dentry *dentry) { struct inode *inode = old_dentry->d_inode; struct yaffs_obj *obj = NULL; @@ -1845,23 +1828,24 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, yaffs_gross_lock(dev); - if (!S_ISDIR(inode->i_mode)) /* Don't link directories */ - link = yaffs_link_obj(yaffs_inode_to_obj(dir), dentry->d_name.name, - obj); + if (!S_ISDIR(inode->i_mode)) /* Don't link directories */ + link = + yaffs_link_obj(yaffs_inode_to_obj(dir), dentry->d_name.name, + obj); if (link) { 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, - (TSTR("yaffs_link link count %d i_count %d\n"), - old_dentry->d_inode->i_nlink, - atomic_read(&old_dentry->d_inode->i_count))); + (TSTR("yaffs_link link count %d i_count %d\n"), + old_dentry->d_inode->i_nlink, + atomic_read(&old_dentry->d_inode->i_count))); } yaffs_gross_unlock(dev); - if (link){ + if (link) { update_dir_time(dir); return 0; } @@ -1870,19 +1854,20 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, } static int yaffs_symlink(struct inode *dir, struct dentry *dentry, - const char *symname) + const char *symname) { 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; + gid_t gid = + (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; T(YAFFS_TRACE_OS, (TSTR("yaffs_symlink\n"))); dev = yaffs_inode_to_obj(dir)->my_dev; yaffs_gross_lock(dev); obj = yaffs_create_symlink(yaffs_inode_to_obj(dir), dentry->d_name.name, - S_IFLNK | S_IRWXUGO, uid, gid, symname); + S_IFLNK | S_IRWXUGO, uid, gid, symname); yaffs_gross_unlock(dev); if (obj) { @@ -1904,7 +1889,7 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, static int yaffs_sync_object(struct file *file, int datasync) #else static int yaffs_sync_object(struct file *file, struct dentry *dentry, - int datasync) + int datasync) #endif { @@ -1918,8 +1903,7 @@ static int yaffs_sync_object(struct file *file, struct dentry *dentry, dev = obj->my_dev; - T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, - (TSTR("yaffs_sync_object\n"))); + T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, (TSTR("yaffs_sync_object\n"))); yaffs_gross_lock(dev); yaffs_flush_file(obj, 1, datasync); yaffs_gross_unlock(dev); @@ -1945,12 +1929,10 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, /* Check if the target is an existing directory that is not empty. */ target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir), - new_dentry->d_name.name); - - + new_dentry->d_name.name); if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY && - !list_empty(&target->variant.dir_variant.children)) { + !list_empty(&target->variant.dir_variant.children)) { T(YAFFS_TRACE_OS, (TSTR("target is non-empty dir\n"))); @@ -1960,9 +1942,9 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, T(YAFFS_TRACE_OS, (TSTR("calling yaffs_rename_obj\n"))); ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir), - old_dentry->d_name.name, - yaffs_inode_to_obj(new_dir), - new_dentry->d_name.name); + old_dentry->d_name.name, + yaffs_inode_to_obj(new_dir), + new_dentry->d_name.name); } yaffs_gross_unlock(dev); @@ -1971,9 +1953,9 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, new_dentry->d_inode->i_nlink--; mark_inode_dirty(new_dentry->d_inode); } - + update_dir_time(old_dir); - if(old_dir != new_dir) + if (old_dir != new_dir) update_dir_time(new_dir); return 0; } else { @@ -1988,34 +1970,34 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) struct yaffs_dev *dev; T(YAFFS_TRACE_OS, - (TSTR("yaffs_setattr of object %d\n"), - yaffs_inode_to_obj(inode)->obj_id)); + (TSTR("yaffs_setattr of object %d\n"), + yaffs_inode_to_obj(inode)->obj_id)); - /* Fail if a requested resize >= 2GB */ - if (attr->ia_valid & ATTR_SIZE && - (attr->ia_size >> 31)) + /* Fail if a requested resize >= 2GB */ + if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31)) error = -EINVAL; if (error == 0) error = inode_change_ok(inode, attr); if (error == 0) { int result; - if (!error){ + if (!error) { error = yaffs_vfs_setattr(inode, attr); - T(YAFFS_TRACE_OS,(TSTR("inode_setattr called\n"))); - if (attr->ia_valid & ATTR_SIZE){ - yaffs_vfs_setsize(inode,attr->ia_size); - inode->i_blocks = (inode->i_size + 511) >> 9; + T(YAFFS_TRACE_OS, (TSTR("inode_setattr called\n"))); + if (attr->ia_valid & ATTR_SIZE) { + yaffs_vfs_setsize(inode, attr->ia_size); + inode->i_blocks = (inode->i_size + 511) >> 9; } } 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))); + 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_inode_to_obj(inode), attr); - if(result == YAFFS_OK) { + if (result == YAFFS_OK) { error = 0; } else { error = -EPERM; @@ -2024,47 +2006,41 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) } - T(YAFFS_TRACE_OS, - (TSTR("yaffs_setattr done returning %d\n"),error)); + T(YAFFS_TRACE_OS, (TSTR("yaffs_setattr done returning %d\n"), error)); return error; } #ifdef CONFIG_YAFFS_XATTR int yaffs_setxattr(struct dentry *dentry, const char *name, - const void *value, size_t size, int flags) + const void *value, size_t size, int flags) { struct inode *inode = dentry->d_inode; int error = 0; 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->obj_id)); - + T(YAFFS_TRACE_OS, (TSTR("yaffs_setxattr of object %d\n"), obj->obj_id)); if (error == 0) { int result; dev = obj->my_dev; yaffs_gross_lock(dev); result = yaffs_set_xattrib(obj, name, value, size, flags); - if(result == YAFFS_OK) + if (result == YAFFS_OK) error = 0; - else if(result < 0) + else if (result < 0) error = result; yaffs_gross_unlock(dev); } - T(YAFFS_TRACE_OS, - (TSTR("yaffs_setxattr done returning %d\n"),error)); + T(YAFFS_TRACE_OS, (TSTR("yaffs_setxattr done returning %d\n"), error)); return error; } - -ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, void *buff, - size_t size) +ssize_t yaffs_getxattr(struct dentry * dentry, const char *name, void *buff, + size_t size) { struct inode *inode = dentry->d_inode; int error = 0; @@ -2072,8 +2048,7 @@ ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, void *buff, struct yaffs_obj *obj = yaffs_inode_to_obj(inode); T(YAFFS_TRACE_OS, - (TSTR("yaffs_getxattr \"%s\" from object %d\n"), - name, obj->obj_id)); + (TSTR("yaffs_getxattr \"%s\" from object %d\n"), name, obj->obj_id)); if (error == 0) { dev = obj->my_dev; @@ -2082,8 +2057,7 @@ ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, void *buff, yaffs_gross_unlock(dev); } - T(YAFFS_TRACE_OS, - (TSTR("yaffs_getxattr done returning %d\n"),error)); + T(YAFFS_TRACE_OS, (TSTR("yaffs_getxattr done returning %d\n"), error)); return error; } @@ -2096,29 +2070,27 @@ int yaffs_removexattr(struct dentry *dentry, const char *name) struct yaffs_obj *obj = yaffs_inode_to_obj(inode); T(YAFFS_TRACE_OS, - (TSTR("yaffs_removexattr of object %d\n"), - obj->obj_id)); - + (TSTR("yaffs_removexattr of object %d\n"), obj->obj_id)); if (error == 0) { int result; dev = obj->my_dev; yaffs_gross_lock(dev); result = yaffs_remove_xattrib(obj, name); - if(result == YAFFS_OK) + if (result == YAFFS_OK) error = 0; - else if(result < 0) + else if (result < 0) error = result; yaffs_gross_unlock(dev); } T(YAFFS_TRACE_OS, - (TSTR("yaffs_removexattr done returning %d\n"),error)); + (TSTR("yaffs_removexattr done returning %d\n"), error)); return error; } -ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) +ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size) { struct inode *inode = dentry->d_inode; int error = 0; @@ -2126,9 +2098,7 @@ ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) struct yaffs_obj *obj = yaffs_inode_to_obj(inode); T(YAFFS_TRACE_OS, - (TSTR("yaffs_listxattr of object %d\n"), - obj->obj_id)); - + (TSTR("yaffs_listxattr of object %d\n"), obj->obj_id)); if (error == 0) { dev = obj->my_dev; @@ -2137,15 +2107,13 @@ ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) yaffs_gross_unlock(dev); } - T(YAFFS_TRACE_OS, - (TSTR("yaffs_listxattr done returning %d\n"),error)); + T(YAFFS_TRACE_OS, (TSTR("yaffs_listxattr done returning %d\n"), error)); return error; } #endif - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) { @@ -2175,14 +2143,17 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) uint64_t bytes_in_dev; uint64_t bytes_free; - 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)); + 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(bytes_in_dev, sb->s_blocksize); /* bytes_in_dev becomes the number of blocks */ + do_div(bytes_in_dev, sb->s_blocksize); /* bytes_in_dev becomes the number of blocks */ buf->f_blocks = bytes_in_dev; - bytes_free = ((uint64_t)(yaffs_get_n_free_chunks(dev))) * - ((uint64_t)(dev->data_bytes_per_chunk)); + bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) * + ((uint64_t) (dev->data_bytes_per_chunk)); do_div(bytes_free, sb->s_blocksize); @@ -2191,21 +2162,21 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) } else if (sb->s_blocksize > dev->data_bytes_per_chunk) { buf->f_blocks = - (dev->param.end_block - dev->param.start_block + 1) * - dev->param.chunks_per_block / - (sb->s_blocksize / dev->data_bytes_per_chunk); + (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->data_bytes_per_chunk); + yaffs_get_n_free_chunks(dev) / + (sb->s_blocksize / dev->data_bytes_per_chunk); } else { buf->f_blocks = - (dev->param.end_block - dev->param.start_block + 1) * - dev->param.chunks_per_block * - (dev->data_bytes_per_chunk / 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->data_bytes_per_chunk / sb->s_blocksize); + yaffs_get_n_free_chunks(dev) * + (dev->data_bytes_per_chunk / sb->s_blocksize); } buf->f_files = 0; @@ -2216,61 +2187,57 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf) return 0; } - - static void yaffs_flush_inodes(struct super_block *sb) { struct inode *iptr; struct yaffs_obj *obj; - - list_for_each_entry(iptr,&sb->s_inodes, i_sb_list){ + + list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) { obj = yaffs_inode_to_obj(iptr); - if(obj){ + if (obj) { T(YAFFS_TRACE_OS, (TSTR("flushing obj %d\n"), - obj->obj_id)); - yaffs_flush_file(obj,1,0); + obj->obj_id)); + yaffs_flush_file(obj, 1, 0); } } } - static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) { - struct yaffs_dev *dev = yaffs_super_to_dev(sb); - if(!dev) + struct yaffs_dev *dev = yaffs_super_to_dev(sb); + if (!dev) return; - + yaffs_flush_inodes(sb); yaffs_update_dirty_dirs(dev); yaffs_flush_whole_cache(dev); - if(do_checkpoint) + if (do_checkpoint) yaffs_checkpoint_save(dev); } - static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev) { - unsigned erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_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 */ + unsigned scattered = 0; /* Free chunks not in an erased block */ - if(erased_chunks < dev->n_free_chunks) + if (erased_chunks < dev->n_free_chunks) scattered = (dev->n_free_chunks - erased_chunks); - if(!context->bg_running) + if (!context->bg_running) return 0; - else if(scattered < (dev->param.chunks_per_block * 2)) + else if (scattered < (dev->param.chunks_per_block * 2)) return 0; - else if(erased_chunks > dev->n_free_chunks/2) + else if (erased_chunks > dev->n_free_chunks / 2) return 0; - else if(erased_chunks > dev->n_free_chunks/4) + else if (erased_chunks > dev->n_free_chunks / 4) return 1; else return 2; } -static int yaffs_do_sync_fs(struct super_block *sb, - int request_checkpoint) +static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint) { struct yaffs_dev *dev = yaffs_super_to_dev(sb); @@ -2279,21 +2246,20 @@ static int yaffs_do_sync_fs(struct super_block *sb, int do_checkpoint; T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, - (TSTR("yaffs_do_sync_fs: gc-urgency %d %s %s%s\n"), - gc_urgent, - sb->s_dirt ? "dirty" : "clean", - request_checkpoint ? "checkpoint requested" : "no checkpoint", - oneshot_checkpoint ? " one-shot" : "" )); + (TSTR("yaffs_do_sync_fs: gc-urgency %d %s %s%s\n"), + gc_urgent, + sb->s_dirt ? "dirty" : "clean", + request_checkpoint ? "checkpoint requested" : "no checkpoint", + oneshot_checkpoint ? " one-shot" : "")); yaffs_gross_lock(dev); do_checkpoint = ((request_checkpoint && !gc_urgent) || - oneshot_checkpoint) && - !dev->is_checkpointed; + oneshot_checkpoint) && !dev->is_checkpointed; if (sb->s_dirt || do_checkpoint) { yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint); sb->s_dirt = 0; - if(oneshot_checkpoint) + if (oneshot_checkpoint) yaffs_auto_checkpoint &= ~4; } yaffs_gross_unlock(dev); @@ -2334,62 +2300,62 @@ static int yaffs_bg_thread_fn(void *data) struct timer_list timer; T(YAFFS_TRACE_BACKGROUND, - (TSTR("yaffs_background starting for dev %p\n"), - (void *)dev)); + (TSTR("yaffs_background starting for dev %p\n"), (void *)dev)); #ifdef YAFFS_COMPILE_FREEZER set_freezable(); #endif - while(context->bg_running){ - T(YAFFS_TRACE_BACKGROUND, - (TSTR("yaffs_background\n"))); + while (context->bg_running) { + T(YAFFS_TRACE_BACKGROUND, (TSTR("yaffs_background\n"))); - if(kthread_should_stop()) + if (kthread_should_stop()) break; #ifdef YAFFS_COMPILE_FREEZER - if(try_to_freeze()) + if (try_to_freeze()) continue; #endif yaffs_gross_lock(dev); now = jiffies; - if(time_after(now, next_dir_update) && yaffs_bg_enable){ + if (time_after(now, next_dir_update) && yaffs_bg_enable) { yaffs_update_dirty_dirs(dev); next_dir_update = now + HZ; } - if(time_after(now,next_gc) && yaffs_bg_enable){ - if(!dev->is_checkpointed){ + if (time_after(now, next_gc) && yaffs_bg_enable) { + if (!dev->is_checkpointed) { urgency = yaffs_bg_gc_urgency(dev); gc_result = yaffs_bg_gc(dev, urgency); - if(urgency > 1) - next_gc = now + HZ/20+1; - else if(urgency > 0) - next_gc = now + HZ/10+1; + if (urgency > 1) + next_gc = now + HZ / 20 + 1; + else if (urgency > 0) + next_gc = now + HZ / 10 + 1; else next_gc = now + HZ * 2; - } else /* - * gc not running so set to next_dir_update - * to cut down on wake ups - */ + } else { + /* + * gc not running so set to next_dir_update + * to cut down on wake ups + */ next_gc = next_dir_update; + } } yaffs_gross_unlock(dev); #if 1 expires = next_dir_update; - if (time_before(next_gc,expires)) + if (time_before(next_gc, expires)) expires = next_gc; - if(time_before(expires,now)) + if (time_before(expires, now)) expires = now + HZ; Y_INIT_TIMER(&timer); - timer.expires = expires+1; - timer.data = (unsigned long) current; + timer.expires = expires + 1; + timer.data = (unsigned long)current; timer.function = yaffs_background_waker; - set_current_state(TASK_INTERRUPTIBLE); + set_current_state(TASK_INTERRUPTIBLE); add_timer(&timer); schedule(); del_timer_sync(&timer); @@ -2406,15 +2372,16 @@ static int yaffs_bg_start(struct yaffs_dev *dev) int retval = 0; struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); - if(dev->read_only) + if (dev->read_only) return -1; context->bg_running = 1; context->bg_thread = kthread_run(yaffs_bg_thread_fn, - (void *)dev,"yaffs-bg-%d",context->mount_id); + (void *)dev, "yaffs-bg-%d", + context->mount_id); - if(IS_ERR(context->bg_thread)){ + if (IS_ERR(context->bg_thread)) { retval = PTR_ERR(context->bg_thread); context->bg_thread = NULL; context->bg_running = 0; @@ -2428,7 +2395,7 @@ static void yaffs_bg_stop(struct yaffs_dev *dev) ctxt->bg_running = 0; - if( ctxt->bg_thread){ + if (ctxt->bg_thread) { kthread_stop(ctxt->bg_thread); ctxt->bg_thread = NULL; } @@ -2449,7 +2416,6 @@ static void yaffs_bg_stop(struct yaffs_dev *dev) } #endif - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) static void yaffs_write_super(struct super_block *sb) #else @@ -2459,8 +2425,8 @@ static int yaffs_write_super(struct super_block *sb) unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2); T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, - (TSTR("yaffs_write_super%s\n"), - request_checkpoint ? " checkpt" : "")); + (TSTR("yaffs_write_super%s\n"), + request_checkpoint ? " checkpt" : "")); yaffs_do_sync_fs(sb, request_checkpoint); @@ -2469,7 +2435,6 @@ static int yaffs_write_super(struct super_block *sb) #endif } - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) static int yaffs_sync_fs(struct super_block *sb, int wait) #else @@ -2479,8 +2444,7 @@ static int yaffs_sync_fs(struct super_block *sb) unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1); T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, - (TSTR("yaffs_sync_fs%s\n"), - request_checkpoint ? " checkpt" : "")); + (TSTR("yaffs_sync_fs%s\n"), request_checkpoint ? " checkpt" : "")); yaffs_do_sync_fs(sb, request_checkpoint); @@ -2495,8 +2459,7 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) struct yaffs_obj *obj; struct yaffs_dev *dev = yaffs_super_to_dev(sb); - T(YAFFS_TRACE_OS, - (TSTR("yaffs_iget for %lu\n"), ino)); + T(YAFFS_TRACE_OS, (TSTR("yaffs_iget for %lu\n"), ino)); inode = iget_locked(sb, ino); if (!inode) @@ -2534,23 +2497,23 @@ static void yaffs_read_inode(struct inode *inode) 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)); + (TSTR("yaffs_read_inode for %d\n"), (int)inode->i_ino)); - if(current != yaffs_dev_to_lc(dev)->readdir_process) + 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)->readdir_process) + if (current != yaffs_dev_to_lc(dev)->readdir_process) yaffs_gross_unlock(dev); } #endif static LIST_HEAD(yaffs_context_list); -struct semaphore yaffs_context_lock; +struct mutex yaffs_context_lock; static void yaffs_put_super(struct super_block *sb) { @@ -2559,26 +2522,25 @@ static void yaffs_put_super(struct super_block *sb) T(YAFFS_TRACE_OS, (TSTR("yaffs_put_super\n"))); T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, - (TSTR("Shutting down yaffs background thread\n"))); + (TSTR("Shutting down yaffs background thread\n"))); yaffs_bg_stop(dev); T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, - (TSTR("yaffs background thread shut down\n"))); + (TSTR("yaffs background thread shut down\n"))); yaffs_gross_lock(dev); - yaffs_flush_super(sb,1); + yaffs_flush_super(sb, 1); if (yaffs_dev_to_lc(dev)->put_super_fn) yaffs_dev_to_lc(dev)->put_super_fn(sb); - yaffs_deinitialise(dev); yaffs_gross_unlock(dev); - down(&yaffs_context_lock); + mutex_lock(&yaffs_context_lock); list_del_init(&(yaffs_dev_to_lc(dev)->context_list)); - up(&yaffs_context_lock); + mutex_unlock(&yaffs_context_lock); if (yaffs_dev_to_lc(dev)->spare_buffer) { YFREE(yaffs_dev_to_lc(dev)->spare_buffer); @@ -2588,7 +2550,6 @@ static void yaffs_put_super(struct super_block *sb) kfree(dev); } - static void yaffs_mtd_put_super(struct super_block *sb) { struct mtd_info *mtd = yaffs_dev_to_mtd(yaffs_super_to_dev(sb)); @@ -2599,7 +2560,6 @@ static void yaffs_mtd_put_super(struct super_block *sb) put_mtd_device(mtd); } - static void yaffs_touch_super(struct yaffs_dev *dev) { struct super_block *sb = yaffs_dev_to_lc(dev)->super; @@ -2620,10 +2580,11 @@ struct yaffs_options { int lazy_loading_overridden; int empty_lost_and_found; int empty_lost_and_found_overridden; -} ; +}; #define MAX_OPT_LEN 30 -static int yaffs_parse_options(struct yaffs_options *options, const char *options_str) +static int yaffs_parse_options(struct yaffs_options *options, + const char *options_str) { char cur_opt[MAX_OPT_LEN + 1]; int p; @@ -2635,7 +2596,7 @@ static int yaffs_parse_options(struct yaffs_options *options, const char *option memset(cur_opt, 0, MAX_OPT_LEN + 1); p = 0; - while(*options_str == ',') + while (*options_str == ',') options_str++; while (*options_str && *options_str != ',') { @@ -2646,38 +2607,38 @@ static int yaffs_parse_options(struct yaffs_options *options, const char *option options_str++; } - if (!strcmp(cur_opt, "inband-tags")) + if (!strcmp(cur_opt, "inband-tags")) { options->inband_tags = 1; - else if (!strcmp(cur_opt, "tags-ecc-off")){ + } else if (!strcmp(cur_opt, "tags-ecc-off")) { options->tags_ecc_on = 0; - options->tags_ecc_overridden=1; - } else if (!strcmp(cur_opt, "tags-ecc-on")){ + options->tags_ecc_overridden = 1; + } else if (!strcmp(cur_opt, "tags-ecc-on")) { options->tags_ecc_on = 1; options->tags_ecc_overridden = 1; - } else if (!strcmp(cur_opt, "lazy-loading-off")){ + } else if (!strcmp(cur_opt, "lazy-loading-off")) { options->lazy_loading_enabled = 0; - options->lazy_loading_overridden=1; - } else if (!strcmp(cur_opt, "lazy-loading-on")){ + options->lazy_loading_overridden = 1; + } else if (!strcmp(cur_opt, "lazy-loading-on")) { options->lazy_loading_enabled = 1; options->lazy_loading_overridden = 1; - } else if (!strcmp(cur_opt, "empty-lost-and-found-off")){ + } else if (!strcmp(cur_opt, "empty-lost-and-found-off")) { options->empty_lost_and_found = 0; - options->empty_lost_and_found_overridden=1; - } else if (!strcmp(cur_opt, "empty-lost-and-found-on")){ + options->empty_lost_and_found_overridden = 1; + } else if (!strcmp(cur_opt, "empty-lost-and-found-on")) { options->empty_lost_and_found = 1; - options->empty_lost_and_found_overridden=1; - } else if (!strcmp(cur_opt, "no-cache")) + options->empty_lost_and_found_overridden = 1; + } else if (!strcmp(cur_opt, "no-cache")) { options->no_cache = 1; - else if (!strcmp(cur_opt, "no-checkpoint-read")) + } else if (!strcmp(cur_opt, "no-checkpoint-read")) { options->skip_checkpoint_read = 1; - else if (!strcmp(cur_opt, "no-checkpoint-write")) + } else if (!strcmp(cur_opt, "no-checkpoint-write")) { options->skip_checkpoint_write = 1; - else if (!strcmp(cur_opt, "no-checkpoint")) { + } else if (!strcmp(cur_opt, "no-checkpoint")) { options->skip_checkpoint_read = 1; options->skip_checkpoint_write = 1; } else { printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n", - cur_opt); + cur_opt); error = 1; } } @@ -2686,8 +2647,8 @@ static int yaffs_parse_options(struct yaffs_options *options, const char *option } static struct super_block *yaffs_internal_read_super(int yaffs_version, - struct super_block *sb, - void *data, int silent) + struct super_block *sb, + void *data, int silent) { int n_blocks; struct inode *inode = NULL; @@ -2713,8 +2674,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, sb->s_op = &yaffs_super_ops; sb->s_flags |= MS_NOATIME; - read_only =((sb->s_flags & MS_RDONLY) != 0); - + read_only = ((sb->s_flags & MS_RDONLY) != 0); #ifdef YAFFS_COMPILE_EXPORTFS sb->s_export_op = &yaffs_export_ops; @@ -2729,8 +2689,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, else printk(KERN_INFO "yaffs: dev is %d name is \"%s\" %s\n", sb->s_dev, - yaffs_devname(sb, devname_buf), - read_only ? "ro" : "rw"); + yaffs_devname(sb, devname_buf), read_only ? "ro" : "rw"); if (!data_str) data_str = ""; @@ -2744,20 +2703,17 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, return NULL; } - sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; T(YAFFS_TRACE_OS, - (TSTR("yaffs_read_super: Using yaffs%d\n"), yaffs_version)); + (TSTR("yaffs_read_super: Using yaffs%d\n"), yaffs_version)); T(YAFFS_TRACE_OS, - (TSTR("yaffs_read_super: block size %d\n"), - (int)(sb->s_blocksize))); + (TSTR("yaffs_read_super: block size %d\n"), (int)(sb->s_blocksize))); T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs: Attempting MTD mount of %u.%u,\"%s\"\n"), - MAJOR(sb->s_dev), MINOR(sb->s_dev), - yaffs_devname(sb, devname_buf))); + (TSTR("yaffs: Attempting MTD mount of %u.%u,\"%s\"\n"), + MAJOR(sb->s_dev), MINOR(sb->s_dev), yaffs_devname(sb, devname_buf))); /* Check it's an mtd device..... */ if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) @@ -2767,15 +2723,15 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, mtd = get_mtd_device(NULL, MINOR(sb->s_dev)); if (!mtd) { T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs: MTD device #%u doesn't appear to exist\n"), - MINOR(sb->s_dev))); + (TSTR("yaffs: MTD device #%u doesn't appear to exist\n"), + MINOR(sb->s_dev))); return NULL; } /* Check it's NAND */ if (mtd->type != MTD_NANDFLASH) { T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs: MTD device is not NAND it's type %d\n"), - mtd->type)); + (TSTR("yaffs: MTD device is not NAND it's type %d\n"), + mtd->type)); return NULL; } @@ -2798,27 +2754,23 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, #ifdef CONFIG_YAFFS_AUTO_YAFFS2 if (yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) { - T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs: auto selecting yaffs2\n"))); + T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: auto selecting yaffs2\n"))); yaffs_version = 2; } /* Added NCB 26/5/2006 for completeness */ - if (yaffs_version == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) { - T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs: auto selecting yaffs1\n"))); + if (yaffs_version == 2 && !options.inband_tags + && WRITE_SIZE(mtd) == 512) { + T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: auto selecting yaffs1\n"))); yaffs_version = 1; } - #endif if (yaffs_version == 2) { /* Check for version 2 style functions */ if (!mtd->erase || !mtd->block_isbad || - !mtd->block_markbad || - !mtd->read || - !mtd->write || + !mtd->block_markbad || !mtd->read || !mtd->write || #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) !mtd->read_oob || !mtd->write_oob) { #else @@ -2827,23 +2779,21 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, #endif T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: MTD device does not support required " - "functions\n"))); + "functions\n"))); return NULL; } if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE || - mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) && + mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) && !options.inband_tags) { T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: MTD device does not have the " - "right page sizes\n"))); + "right page sizes\n"))); return NULL; } } else { /* Check for V1 style functions */ - if (!mtd->erase || - !mtd->read || - !mtd->write || + if (!mtd->erase || !mtd->read || !mtd->write || #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) !mtd->read_oob || !mtd->write_oob) { #else @@ -2852,7 +2802,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, #endif T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: MTD device does not support required " - "functions\n"))); + "functions\n"))); return NULL; } @@ -2860,7 +2810,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, mtd->oobsize != YAFFS_BYTES_PER_SPARE) { T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: MTD device does not support have the " - "right page sizes\n"))); + "right page sizes\n"))); return NULL; } } @@ -2870,19 +2820,20 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, * Set the struct yaffs_dev up for mtd */ - if (!read_only && !(mtd->flags & MTD_WRITEABLE)){ + if (!read_only && !(mtd->flags & MTD_WRITEABLE)) { read_only = 1; - printk(KERN_INFO "yaffs: mtd is read only, setting superblock read only"); + printk(KERN_INFO + "yaffs: mtd is read only, setting superblock read only"); sb->s_flags |= MS_RDONLY; } dev = kmalloc(sizeof(struct yaffs_dev), GFP_KERNEL); - context = kmalloc(sizeof(struct yaffs_linux_context),GFP_KERNEL); - - if(!dev || !context ){ - if(dev) + context = kmalloc(sizeof(struct yaffs_linux_context), GFP_KERNEL); + + if (!dev || !context) { + if (dev) kfree(dev); - if(context) + if (context) kfree(context); dev = NULL; context = NULL; @@ -2892,13 +2843,13 @@ 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 " - "struct yaffs_dev. \n"))); + "struct yaffs_dev. \n"))); return NULL; } memset(dev, 0, sizeof(struct yaffs_dev)); param = &(dev->param); - memset(context,0,sizeof(struct yaffs_linux_context)); + memset(context, 0, sizeof(struct yaffs_linux_context)); dev->os_context = context; INIT_LIST_HEAD(&(context->context_list)); context->dev = dev; @@ -2911,13 +2862,15 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, #else sb->u.generic_sbp = dev; #endif - + dev->driver_context = mtd; param->name = mtd->name; /* Set up the memory size parameters.... */ - n_blocks = 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->start_block = 0; param->end_block = n_blocks - 1; @@ -2933,7 +2886,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, #ifdef CONFIG_YAFFS_XATTR param->enable_xattr = 1; #endif - if(options.lazy_loading_overridden) + if (options.lazy_loading_overridden) param->disable_lazy_load = !options.lazy_loading_enabled; #ifdef CONFIG_YAFFS_DISABLE_TAGS_ECC @@ -2945,7 +2898,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, param->defered_dir_update = 1; #endif - if(options.tags_ecc_overridden) + if (options.tags_ecc_overridden) param->no_tags_ecc = !options.tags_ecc_on; #ifdef CONFIG_YAFFS_EMPTY_LOST_AND_FOUND @@ -2962,15 +2915,13 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, param->always_check_erased = 1; #endif - if(options.empty_lost_and_found_overridden) + if (options.empty_lost_and_found_overridden) param->empty_lost_n_found = options.empty_lost_and_found; /* ... and the functions. */ if (yaffs_version == 2) { - param->write_chunk_tags_fn = - nandmtd2_write_chunk_tags; - param->read_chunk_tags_fn = - nandmtd2_read_chunk_tags; + 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); @@ -2989,10 +2940,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, } else { #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) /* use the MTD interface in yaffs_mtdif1.c */ - param->write_chunk_tags_fn = - nandmtd1_write_chunk_tags; - param->read_chunk_tags_fn = - nandmtd1_read_chunk_tags; + 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 @@ -3010,8 +2959,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, param->sb_dirty_fn = yaffs_touch_super; param->gc_control = yaffs_gc_control_callback; - yaffs_dev_to_lc(dev)->super= sb; - + yaffs_dev_to_lc(dev)->super = sb; #ifndef CONFIG_YAFFS_DOES_ECC param->use_nand_ecc = 1; @@ -3024,27 +2972,30 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, param->skip_checkpt_rd = options.skip_checkpoint_read; param->skip_checkpt_wr = options.skip_checkpoint_write; - down(&yaffs_context_lock); + mutex_lock(&yaffs_context_lock); /* Get a mount id */ found = 0; - for(mount_id=0; ! found; mount_id++){ + for (mount_id = 0; !found; mount_id++) { found = 1; - list_for_each(l,&yaffs_context_list){ - context_iterator = list_entry(l,struct yaffs_linux_context,context_list); - if(context_iterator->mount_id == mount_id) + list_for_each(l, &yaffs_context_list) { + context_iterator = + list_entry(l, struct yaffs_linux_context, + context_list); + if (context_iterator->mount_id == mount_id) found = 0; } } context->mount_id = mount_id; - list_add_tail(&(yaffs_dev_to_lc(dev)->context_list), &yaffs_context_list); - up(&yaffs_context_lock); + list_add_tail(&(yaffs_dev_to_lc(dev)->context_list), + &yaffs_context_list); + mutex_unlock(&yaffs_context_lock); - /* Directory search handling...*/ - INIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->search_contexts)); - param->remove_obj_fn = yaffs_remove_obj_callback; + /* Directory search handling... */ + INIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->search_contexts)); + param->remove_obj_fn = yaffs_remove_obj_callback; - init_MUTEX(&(yaffs_dev_to_lc(dev)->gross_lock)); + mutex_init(&(yaffs_dev_to_lc(dev)->gross_lock)); yaffs_gross_lock(dev); @@ -3053,21 +3004,19 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: guts initialised %s\n"), (err == YAFFS_OK) ? "OK" : "FAILED")); - - if(err == YAFFS_OK) + + if (err == YAFFS_OK) yaffs_bg_start(dev); - - if(!context->bg_thread) - param->defered_dir_update = 0; + if (!context->bg_thread) + param->defered_dir_update = 0; /* Release lock before yaffs_get_inode() */ yaffs_gross_unlock(dev); /* Create root inode */ if (err == YAFFS_OK) - inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0, - yaffs_root(dev)); + inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0, yaffs_root(dev)); if (!inode) return NULL; @@ -3088,14 +3037,13 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, sb->s_root = root; sb->s_dirt = !dev->is_checkpointed; T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs_read_super: is_checkpointed %d\n"), - dev->is_checkpointed)); + (TSTR("yaffs_read_super: is_checkpointed %d\n"), + dev->is_checkpointed)); T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: done\n"))); return sb; } - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data, int silent) @@ -3141,7 +3089,6 @@ static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV); #endif - #ifdef CONFIG_YAFFS_YAFFS2 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) @@ -3153,11 +3100,11 @@ static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data, #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) static int yaffs2_read_super(struct file_system_type *fs, - int flags, const char *dev_name, void *data, - struct vfsmount *mnt) + int flags, const char *dev_name, void *data, + struct vfsmount *mnt) { return get_sb_bdev(fs, flags, dev_name, data, - yaffs2_internal_read_super_mtd, mnt); + yaffs2_internal_read_super_mtd, mnt); } #else static struct super_block *yaffs2_read_super(struct file_system_type *fs, @@ -3188,40 +3135,58 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, FS_REQUIRES_DEV); #endif -#endif /* CONFIG_YAFFS_YAFFS2 */ +#endif /* CONFIG_YAFFS_YAFFS2 */ static struct proc_dir_entry *my_proc_entry; static struct proc_dir_entry *debug_proc_entry; -static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev * dev) +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, "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, "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, "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_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"); return buf; } - -static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev * dev) +static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev) { - buf += sprintf(buf, "data_bytes_per_chunk. %d\n", dev->data_bytes_per_chunk); + 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, "blocks_in_checkpt.... %d\n", dev->blocks_in_checkpt); buf += sprintf(buf, "\n"); buf += sprintf(buf, "n_tnodes............. %d\n", dev->n_tnodes); buf += sprintf(buf, "n_obj................ %d\n", dev->n_obj); @@ -3232,19 +3197,27 @@ static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev * dev) 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, "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_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, "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, "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); @@ -3270,63 +3243,72 @@ static int yaffs_proc_read(char *page, /* Print header first */ if (step == 0) - buf += sprintf(buf, "Multi-version YAFFS built:" __DATE__ " " __TIME__"\n"); + buf += + sprintf(buf, + "Multi-version YAFFS built:" __DATE__ " " __TIME__ + "\n"); else if (step == 1) - buf += sprintf(buf,"\n"); + buf += sprintf(buf, "\n"); else { - step-=2; - - down(&yaffs_context_lock); + step -= 2; + + mutex_lock(&yaffs_context_lock); /* Locate and print the Nth entry. Order N-squared but N is small. */ list_for_each(item, &yaffs_context_list) { - struct yaffs_linux_context *dc = list_entry(item, struct yaffs_linux_context, context_list); + struct yaffs_linux_context *dc = + list_entry(item, struct yaffs_linux_context, + context_list); struct yaffs_dev *dev = dc->dev; if (n < (step & ~1)) { - n+=2; + n += 2; continue; } - if((step & 1)==0){ - buf += sprintf(buf, "\nDevice %d \"%s\"\n", n, dev->param.name); + if ((step & 1) == 0) { + buf += + sprintf(buf, "\nDevice %d \"%s\"\n", n, + dev->param.name); buf = yaffs_dump_dev_part0(buf, dev); - } else + } else { buf = yaffs_dump_dev_part1(buf, dev); - + } + break; } - up(&yaffs_context_lock); + mutex_unlock(&yaffs_context_lock); } return buf - page < count ? buf - page : count; } static int yaffs_stats_proc_read(char *page, - char **start, - off_t offset, int count, int *eof, void *data) + char **start, + off_t offset, int count, int *eof, void *data) { struct list_head *item; char *buf = page; int n = 0; - down(&yaffs_context_lock); + mutex_lock(&yaffs_context_lock); /* Locate and print the Nth entry. Order N-squared but N is small. */ list_for_each(item, &yaffs_context_list) { - struct yaffs_linux_context *dc = list_entry(item, struct yaffs_linux_context, context_list); + struct yaffs_linux_context *dc = + list_entry(item, struct yaffs_linux_context, context_list); struct yaffs_dev *dev = dc->dev; int erased_chunks; - erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block; - - buf += sprintf(buf,"%d, %d, %d, %u, %u, %u, %u\n", - 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); + erased_chunks = + dev->n_erased_blocks * dev->param.chunks_per_block; + buf += sprintf(buf, "%d, %d, %d, %u, %u, %u, %u\n", + n, dev->n_free_chunks, erased_chunks, + dev->bg_gcs, dev->oldest_dirty_gc_count, + dev->n_obj, dev->n_tnodes); + } + mutex_unlock(&yaffs_context_lock); return buf - page < count ? buf - page : count; } @@ -3359,15 +3341,14 @@ static struct { {"os", YAFFS_TRACE_OS}, {"scan_debug", YAFFS_TRACE_SCAN_DEBUG}, {"scan", YAFFS_TRACE_SCAN}, + {"mount", YAFFS_TRACE_MOUNT}, {"tracing", YAFFS_TRACE_TRACING}, {"sync", YAFFS_TRACE_SYNC}, {"write", YAFFS_TRACE_WRITE}, - {"verify", YAFFS_TRACE_VERIFY}, {"verify_nand", YAFFS_TRACE_VERIFY_NAND}, {"verify_full", YAFFS_TRACE_VERIFY_FULL}, {"verify_all", YAFFS_TRACE_VERIFY_ALL}, - {"all", 0xffffffff}, {"none", 0}, {NULL, 0}, @@ -3375,7 +3356,7 @@ static struct { #define MAX_MASK_NAME_LENGTH 40 static int yaffs_proc_write_trace_options(struct file *file, const char *buf, - unsigned long count, void *data) + unsigned long count, void *data) { unsigned rg = 0, mask_bitfield; char *end; @@ -3417,15 +3398,17 @@ static int yaffs_proc_write_trace_options(struct file *file, const char *buf, done = 0; } else { for (x = buf + pos, i = 0; - (*x == '_' || (*x >= 'a' && *x <= 'z')) && - i < MAX_MASK_NAME_LENGTH; x++, i++, pos++) + (*x == '_' || (*x >= 'a' && *x <= 'z')) && + i < MAX_MASK_NAME_LENGTH; x++, i++, pos++) substring[i] = *x; substring[i] = '\0'; for (i = 0; mask_flags[i].mask_name != NULL; i++) { - if (strcmp(substring, mask_flags[i].mask_name) == 0) { + if (strcmp(substring, mask_flags[i].mask_name) + == 0) { mask_name = mask_flags[i].mask_name; - mask_bitfield = mask_flags[i].mask_bitfield; + mask_bitfield = + mask_flags[i].mask_bitfield; done = 0; break; } @@ -3460,18 +3443,18 @@ static int yaffs_proc_write_trace_options(struct file *file, const char *buf, char flag; flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-'; - printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name); + printk(KERN_DEBUG "%c%s\n", flag, + mask_flags[i].mask_name); } } return count; } - static int yaffs_proc_write(struct file *file, const char *buf, - unsigned long count, void *data) + unsigned long count, void *data) { - return yaffs_proc_write_trace_options(file, buf, count, data); + return yaffs_proc_write_trace_options(file, buf, count, data); } /* Stuff to handle installation of file systems */ @@ -3496,36 +3479,34 @@ static int __init init_yaffs_fs(void) #ifdef CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED T(YAFFS_TRACE_ALWAYS, - (TSTR(" \n\n\n\nYAFFS-WARNING CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED selected.\n\n\n\n"))); + (TSTR + (" \n\n\n\nYAFFS-WARNING CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED selected.\n\n\n\n"))); #endif - - - - init_MUTEX(&yaffs_context_lock); + mutex_init(&yaffs_context_lock); /* Install the proc_fs entries */ my_proc_entry = create_proc_entry("yaffs", - S_IRUGO | S_IFREG, - YPROC_ROOT); + S_IRUGO | S_IFREG, YPROC_ROOT); if (my_proc_entry) { my_proc_entry->write_proc = yaffs_proc_write; my_proc_entry->read_proc = yaffs_proc_read; my_proc_entry->data = NULL; - } else + } else { return -ENOMEM; + } debug_proc_entry = create_proc_entry("yaffs_stats", - S_IRUGO | S_IFREG, - YPROC_ROOT); + S_IRUGO | S_IFREG, YPROC_ROOT); if (debug_proc_entry) { debug_proc_entry->write_proc = NULL; debug_proc_entry->read_proc = yaffs_stats_proc_read; debug_proc_entry->data = NULL; - } else + } else { return -ENOMEM; + } /* Now add the file system entries */ @@ -3560,7 +3541,7 @@ static void __exit exit_yaffs_fs(void) struct file_system_to_install *fsinst; T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs built " __DATE__ " " __TIME__ " removing. \n"))); + (TSTR("yaffs built " __DATE__ " " __TIME__ " removing. \n"))); remove_proc_entry("yaffs", YPROC_ROOT); remove_proc_entry("yaffs_stats", YPROC_ROOT); @@ -3577,8 +3558,8 @@ static void __exit exit_yaffs_fs(void) } module_init(init_yaffs_fs) -module_exit(exit_yaffs_fs) + module_exit(exit_yaffs_fs) -MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); + MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2010"); MODULE_LICENSE("GPL");