X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=yaffs_fs.c;h=00bb742cf4aff519208c626eab8a167cf458b33b;hb=dd2f592d2bc84052edc7478bfc132b76692cda33;hp=3fa410b1a503ee7a784effeb6a002908c9903c18;hpb=57aa4494d3652c61037296f06c516c631468f87f;p=yaffs%2F.git

diff --git a/yaffs_fs.c b/yaffs_fs.c
index 3fa410b..00bb742 100644
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -24,11 +24,12 @@
  * * Nick Bane for numerous patches.
  * * Nick Bane for 2.5/2.6 integration.
  * * Andras Toth for mknod rdev issue.
+ * * Michael Fischer for finding the problem with inode inconsistency.
  * * Some code bodily lifted from JFFS2.
  */
 
 
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.33 2004-09-19 08:14:50 charles Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.35 2004-10-20 20:12:43 charles Exp $";
 extern const char *yaffs_guts_c_version;
 
 
@@ -92,7 +93,8 @@ unsigned yaffs_traceMask = YAFFS_TRACE_ALWAYS | YAFFS_TRACE_BAD_BLOCKS;
 #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
 //NCB #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
 
-#if defined(CONFIG_KERNEL_2_5)
+//#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
 #else
 #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
@@ -109,7 +111,8 @@ static int yaffs_sync_object(struct file * file, struct dentry *dentry, int data
 
 static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
 
-#if defined(CONFIG_KERNEL_2_5)	/* Added NCB 185-8-2003 */
+//#if defined(CONFIG_KERNEL_2_5)	/* Added NCB 185-8-2003 */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 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);
 #else
@@ -121,7 +124,8 @@ static int yaffs_unlink(struct inode * dir, struct dentry *dentry);
 static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char * symname);
 static int yaffs_mkdir(struct inode * dir, struct dentry * dentry, int mode);
 
-#if defined(CONFIG_KERNEL_2_5)
+//#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev);
 #else
 static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev);
@@ -129,14 +133,16 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int d
 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);
 
-#if defined(CONFIG_KERNEL_2_5)	/* Added NCB 185-8-2003 */
+//#if defined(CONFIG_KERNEL_2_5)	/* Added NCB 185-8-2003 */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
 #else
 static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
 #endif
 static void yaffs_read_inode (struct inode *inode);
 
-#if defined(CONFIG_KERNEL_2_5)
+//#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 static struct super_block *yaffs_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data);
 #else
 static struct super_block *yaffs_read_super(struct super_block * sb, void * data, int silent);
@@ -359,15 +365,29 @@ static void yaffs_put_inode(struct inode *inode)
 // clear is called to tell the fs to release any per-inode data it holds
 static void yaffs_clear_inode(struct inode *inode)
 {
-	yaffs_Object *obj = yaffs_InodeToObject(inode);
+	yaffs_Object *obj;
+	yaffs_Device *dev;
+	
+	obj = yaffs_InodeToObject(inode);
 	
 	T(YAFFS_TRACE_OS,("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->myDev;
+		yaffs_GrossLock(dev);
+		
+		// Clear the association between the inode ant the yaffs_Object.
 		obj->myInode = NULL;
-		inode->u.generic_ip = NULL;	
+		inode->u.generic_ip = NULL;
+		
+		// If the object freeing was deferred, then the real free happens now.
+		// This should fix the inode inconsistency problem.
+		
+		yaffs_HandleDeferedFree(obj);
+		
+		yaffs_GrossUnlock(dev);
 	}