X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs_single.c;h=c5376e947785231003ed2e397d48c09f40155d87;hp=2e92c2543281afdae8d2c1edd35a74f0c5306372;hb=8b7bb68127f6074218a368f8059e844ab51536c1;hpb=9131fecc79ad4e5fbdb775cdc067bc80aae5adb8

diff --git a/yaffs_vfs_single.c b/yaffs_vfs_single.c
index 2e92c25..c5376e9 100644
--- a/yaffs_vfs_single.c
+++ b/yaffs_vfs_single.c
@@ -57,7 +57,6 @@
 
 #include <asm/div64.h>
 
-
 #include <linux/statfs.h>
 
 #define UnlockPage(p) unlock_page(p)
@@ -72,12 +71,11 @@
 #define WRITE_SIZE_STR "writesize"
 #define WRITE_SIZE(mtd) ((mtd)->writesize)
 
-
 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;
 }
 
 #include <linux/uaccess.h>
@@ -86,6 +84,7 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
 #include "yportenv.h"
 #include "yaffs_trace.h"
 #include "yaffs_guts.h"
+#include "yaffs_attribs.h"
 
 #include "yaffs_linux.h"
 
@@ -115,15 +114,14 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
 #define yaffs_dentry_to_obj(dptr) yaffs_inode_to_obj((dptr)->d_inode)
 #define yaffs_super_to_dev(sb)	((struct yaffs_dev *)sb->s_fs_info)
 
-
 #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);
 
@@ -136,16 +134,16 @@ 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);
 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);
 
 static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-			dev_t dev);
+		       dev_t dev);
 static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
 			struct inode *new_dir, struct dentry *new_dentry);
 static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
@@ -166,23 +164,22 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
 
 #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
 
-
 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);
 
-static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-				int buflen);
+static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
+			  int buflen);
 void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias);
 static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
 
@@ -192,7 +189,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,
@@ -200,7 +196,6 @@ static struct address_space_operations yaffs_file_address_operations = {
 	.write_end = yaffs_write_end,
 };
 
-
 static const struct file_operations yaffs_file_operations = {
 	.read = do_sync_read,
 	.write = do_sync_write,
@@ -214,8 +209,6 @@ static const struct file_operations yaffs_file_operations = {
 	.llseek = generic_file_llseek,
 };
 
-
-
 static const struct inode_operations yaffs_file_inode_operations = {
 	.setattr = yaffs_setattr,
 #ifdef CONFIG_YAFFS_XATTR
@@ -276,16 +269,15 @@ 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)
 {
-	setattr_copy(inode,attr);
+	setattr_copy(inode, attr);
 	return 0;
 }
 
-static  int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
+static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
 {
-	truncate_setsize(inode,newsize);
+	truncate_setsize(inode, newsize);
 	return 0;
 }
 
@@ -293,39 +285,41 @@ 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));
 }
 
-
-
 /* ExportFS support */
-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)
@@ -365,12 +359,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,
-} ;
+};
 
 /*-----------------------------------------------------------------*/
 /* Directory search context allows us to unlock access to yaffs during
@@ -395,7 +388,7 @@ struct yaffs_search_context {
 	struct yaffs_dev *dev;
 	struct yaffs_obj *dir_obj;
 	struct yaffs_obj *next_return;
-	struct ylist_head others;
+	struct list_head others;
 };
 
 /*
@@ -404,21 +397,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( ylist_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 = 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)->search_contexts));
+			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));
 	}
 	return sc;
 }
@@ -426,10 +420,10 @@ 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){
-		ylist_del(&sc->others);
+	if (sc) {
+		list_del(&sc->others);
 		YFREE(sc);
 	}
 }
@@ -441,20 +435,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 ||
-                ylist_empty(&sc->dir_obj->variant.dir_variant.children))
-                sc->next_return = NULL;
-        else {
-                struct ylist_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 = ylist_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);
+	}
 }
 
 /*
@@ -465,30 +460,29 @@ static void yaffs_search_advance(struct yaffs_search_context *sc)
 static void yaffs_remove_obj_callback(struct yaffs_obj *obj)
 {
 
-        struct ylist_head *i;
-        struct yaffs_search_context *sc;
-        struct ylist_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.
-         */
-         ylist_for_each(i, search_contexts) {
-                if (i) {
-                        sc = ylist_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;
@@ -531,57 +525,56 @@ out:
 	return ret;
 }
 
-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);
 }
 
 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
  */
 
 static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-				struct nameidata *n)
+				   struct nameidata *n)
 {
 	struct yaffs_obj *obj;
 	struct inode *inode = NULL;	/* NCB 2.5/2.6 needs NULL here */
 
 	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")));
 			d_add(dentry, inode);
 			/* return dentry; */
 			return NULL;
 		}
 
 	} else {
-		T(YAFFS_TRACE_OS,(TSTR("yaffs_lookup not found\n")));
+		T(YAFFS_TRACE_OS, (TSTR("yaffs_lookup not found\n")));
 
 	}
 
@@ -590,7 +583,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
@@ -599,13 +591,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
@@ -625,7 +616,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;
@@ -634,16 +625,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);
@@ -652,14 +643,12 @@ 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);
 	}
 
-
 }
 
-
 static int yaffs_file_flush(struct file *file, fl_owner_t id)
 {
 	struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry);
@@ -667,8 +656,8 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id)
 	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);
 
@@ -690,9 +679,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);
 
@@ -706,8 +695,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);
 
@@ -741,7 +729,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;
 }
@@ -769,20 +757,21 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
 
 	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);
@@ -790,8 +779,8 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
 		}
 	}
 
-	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);
 
@@ -802,20 +791,20 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
 	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);
 
@@ -828,10 +817,9 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
 	return (n_written == n_bytes) ? 0 : -ENOSPC;
 }
 
-
 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;
@@ -844,12 +832,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);
@@ -874,7 +862,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) {
@@ -884,10 +872,9 @@ out:
 	return ret;
 }
 
-
 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;
@@ -897,15 +884,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 */
@@ -919,12 +906,11 @@ static int yaffs_write_end(struct file *filp, struct address_space *mapping,
 	return ret;
 }
 
-
-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) {
@@ -978,20 +964,21 @@ 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 */
 			init_special_inode(inode, obj->yst_mode,
-					old_decode_dev(obj->yst_rdev));
+					   old_decode_dev(obj->yst_rdev));
 			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;
@@ -1008,32 +995,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))
@@ -1047,7 +1034,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;
@@ -1069,20 +1056,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;
@@ -1092,9 +1079,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)));
 		}
 
 	}
@@ -1113,7 +1099,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;
@@ -1132,25 +1117,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;
@@ -1159,7 +1141,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;
 
@@ -1169,16 +1151,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];
 
@@ -1191,20 +1172,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;
 		}
@@ -1214,11 +1196,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;
 		}
@@ -1237,37 +1220,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:
@@ -1278,8 +1258,6 @@ out:
 	return ret_val;
 }
 
-
-
 /*
  * File creation. Allocate an inode, and we're done..
  */
@@ -1287,7 +1265,7 @@ out:
 #define YCRED(x) (x->cred)
 
 static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-			dev_t rdev)
+		       dev_t rdev)
 {
 	struct inode *inode;
 
@@ -1298,24 +1276,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;
 
@@ -1325,19 +1304,19 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
 	default:
 		/* Special (socket, fifo, device...) */
 		T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making special\n")));
-		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));
 		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")));
@@ -1353,13 +1332,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;
 	}
 
@@ -1377,7 +1355,7 @@ static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
 			struct nameidata *n)
 {
-	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);
 }
 
@@ -1389,9 +1367,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;
 
@@ -1415,7 +1392,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;
@@ -1429,23 +1406,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;
 	}
@@ -1454,19 +1432,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) {
@@ -1495,8 +1474,7 @@ static int yaffs_sync_object(struct file *file, int datasync)
 
 	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);
@@ -1522,12 +1500,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 &&
-		!ylist_empty(&target->variant.dir_variant.children)) {
+	    !list_empty(&target->variant.dir_variant.children)) {
 
 		T(YAFFS_TRACE_OS, (TSTR("target is non-empty dir\n")));
 
@@ -1537,9 +1513,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);
 
@@ -1548,9 +1524,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 {
@@ -1565,34 +1541,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;
@@ -1601,47 +1577,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;
@@ -1649,8 +1619,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;
@@ -1659,8 +1628,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;
 }
@@ -1673,29 +1641,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;
@@ -1703,9 +1669,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;
@@ -1714,15 +1678,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
 
-
 static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
 	struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
@@ -1742,14 +1704,17 @@ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *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);
 
@@ -1758,21 +1723,21 @@ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *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;
@@ -1783,61 +1748,57 @@ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *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);
@@ -1846,21 +1807,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);
@@ -1880,7 +1840,6 @@ static int yaffs_do_sync_fs(struct super_block *sb,
  * The thread should not do any writing while the fs is in read only.
  */
 
-
 void yaffs_background_waker(unsigned long data)
 {
 	wake_up_process((struct task_struct *)data);
@@ -1900,58 +1859,58 @@ 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));
 
 	set_freezable();
-	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;
 
-		if(try_to_freeze())
+		if (try_to_freeze())
 			continue;
 
 		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);
 		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);
@@ -1965,15 +1924,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;
@@ -1987,33 +1947,30 @@ 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;
 	}
 }
 
-
 static void 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);
 
 }
 
-
 static int yaffs_sync_fs(struct super_block *sb, int wait)
 {
 	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);
 
@@ -2026,8 +1983,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)
@@ -2052,8 +2008,8 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
 	return inode;
 }
 
-static YLIST_HEAD(yaffs_context_list);
-struct semaphore yaffs_context_lock;
+static LIST_HEAD(yaffs_context_list);
+struct mutex yaffs_context_lock;
 
 static void yaffs_put_super(struct super_block *sb)
 {
@@ -2062,26 +2018,24 @@ 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);
-	ylist_del_init(&(yaffs_dev_to_lc(dev)->context_list));
-	up(&yaffs_context_lock);
+	mutex_lock(&yaffs_context_lock);
+	list_del_init(&(yaffs_dev_to_lc(dev)->context_list));
+	mutex_unlock(&yaffs_context_lock);
 
 	if (yaffs_dev_to_lc(dev)->spare_buffer) {
 		YFREE(yaffs_dev_to_lc(dev)->spare_buffer);
@@ -2091,7 +2045,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));
@@ -2102,7 +2055,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;
@@ -2112,7 +2064,7 @@ static void yaffs_touch_super(struct yaffs_dev *dev)
 		sb->s_dirt = 1;
 }
 
-typedef struct {
+struct yaffs_options {
 	int inband_tags;
 	int skip_checkpoint_read;
 	int skip_checkpoint_write;
@@ -2123,10 +2075,11 @@ typedef struct {
 	int lazy_loading_overridden;
 	int empty_lost_and_found;
 	int empty_lost_and_found_overridden;
-} yaffs_options;
+};
 
 #define MAX_OPT_LEN 30
-static int yaffs_parse_options(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;
@@ -2138,7 +2091,7 @@ static int yaffs_parse_options(yaffs_options *options, const char *options_str)
 		memset(cur_opt, 0, MAX_OPT_LEN + 1);
 		p = 0;
 
-		while(*options_str == ',')
+		while (*options_str == ',')
 			options_str++;
 
 		while (*options_str && *options_str != ',') {
@@ -2149,38 +2102,38 @@ static int yaffs_parse_options(yaffs_options *options, const char *options_str)
 			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;
 		}
 	}
@@ -2189,8 +2142,8 @@ static int yaffs_parse_options(yaffs_options *options, const char *options_str)
 }
 
 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;
@@ -2205,18 +2158,18 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
 	int read_only = 0;
 
-	yaffs_options options;
+	struct yaffs_options options;
 
 	unsigned mount_id;
 	int found;
 	struct yaffs_linux_context *context_iterator;
-	struct ylist_head *l;
+	struct list_head *l;
 
 	sb->s_magic = YAFFS_MAGIC;
 	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);
 
 	sb->s_export_op = &yaffs_export_ops;
 
@@ -2229,8 +2182,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 = "";
@@ -2244,20 +2196,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)
@@ -2267,15 +2216,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;
 	}
 
@@ -2294,18 +2243,16 @@ 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) {
@@ -2314,31 +2261,29 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 		    !mtd->block_isbad ||
 		    !mtd->block_markbad ||
 		    !mtd->read ||
-		    !mtd->write ||
-		    !mtd->read_oob || !mtd->write_oob) {
+		    !mtd->write || !mtd->read_oob || !mtd->write_oob) {
 			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 ||
-		    !mtd->read_oob || !mtd->write_oob) {
+		    !mtd->write || !mtd->read_oob || !mtd->write_oob) {
 			T(YAFFS_TRACE_ALWAYS,
 			  (TSTR("yaffs: MTD device does not support required "
-			   "functions\n")));
+				"functions\n")));
 			return NULL;
 		}
 
@@ -2346,7 +2291,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;
 		}
 	}
@@ -2356,19 +2301,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;
@@ -2378,28 +2324,30 @@ 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;
-	YINIT_LIST_HEAD(&(context->context_list));
+	INIT_LIST_HEAD(&(context->context_list));
 	context->dev = dev;
 	context->super = sb;
 
 	dev->read_only = read_only;
 
 	sb->s_fs_info = dev;
-	
+
 	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;
@@ -2415,7 +2363,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
@@ -2427,7 +2375,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
@@ -2444,15 +2392,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);
@@ -2465,10 +2411,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 		param->end_block = n_blocks - 1;
 	} else {
 		/* 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;
 		param->is_yaffs2 = 0;
@@ -2482,41 +2426,39 @@ 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;
 #endif
 
-#ifdef CONFIG_YAFFS_DISABLE_WIDE_TNODES
-	param->wide_tnodes_disabled = 1;
-#endif
-
 	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;
-		ylist_for_each(l,&yaffs_context_list){
-			context_iterator = ylist_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;
 
-	ylist_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...*/
-        YINIT_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);
 
@@ -2525,21 +2467,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;
@@ -2560,14 +2500,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;
 }
 
-
 static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
 					 int silent)
 {
@@ -2591,7 +2530,6 @@ static struct file_system_type yaffs_fs_type = {
 	.fs_flags = FS_REQUIRES_DEV,
 };
 
-
 #ifdef CONFIG_YAFFS_YAFFS2
 
 static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
@@ -2601,11 +2539,11 @@ static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
 }
 
 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);
 }
 
 static struct file_system_type yaffs2_fs_type = {
@@ -2615,40 +2553,62 @@ static struct file_system_type yaffs2_fs_type = {
 	.kill_sb = kill_block_super,
 	.fs_flags = FS_REQUIRES_DEV,
 };
-#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)
-{
-	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);
+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_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, "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, "n_tnodes.............. %d\n", dev->n_tnodes);
 	buf += sprintf(buf, "n_obj................. %d\n", dev->n_obj);
@@ -2659,19 +2619,29 @@ 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_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);
 
@@ -2682,7 +2652,7 @@ static int yaffs_proc_read(char *page,
 			   char **start,
 			   off_t offset, int count, int *eof, void *data)
 {
-	struct ylist_head *item;
+	struct list_head *item;
 	char *buf = page;
 	int step = offset;
 	int n = 0;
@@ -2697,63 +2667,69 @@ static int yaffs_proc_read(char *page,
 
 	/* Print header first */
 	if (step == 0)
-		buf += sprintf(buf, "YAFFS built:" __DATE__ " " __TIME__"\n");
+		buf += sprintf(buf, "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. */
-		ylist_for_each(item, &yaffs_context_list) {
-			struct yaffs_linux_context *dc = ylist_entry(item, struct yaffs_linux_context, context_list);
+		list_for_each(item, &yaffs_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 ylist_head *item;
+	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. */
-	ylist_for_each(item, &yaffs_context_list) {
-		struct yaffs_linux_context *dc = ylist_entry(item, struct yaffs_linux_context, context_list);
+	list_for_each(item, &yaffs_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;
 }
@@ -2768,7 +2744,7 @@ static struct {
 	char *mask_name;
 	unsigned mask_bitfield;
 } mask_flags[] = {
-	{"allocate", YAFFS_TRACE_ALLOCATE},
+	{"allocate", YAFFS_TRACE_ALLOCATE}, 
 	{"always", YAFFS_TRACE_ALWAYS},
 	{"background", YAFFS_TRACE_BACKGROUND},
 	{"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
@@ -2786,15 +2762,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},
@@ -2802,7 +2777,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;
@@ -2844,15 +2819,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;
 				}
@@ -2887,18 +2864,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 */
@@ -2923,36 +2900,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 */
 
@@ -2987,7 +2962,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);
@@ -3004,8 +2979,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");