* * 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.32 2003-10-29 20:42:34 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;
#include <linux/string.h>
-#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+
#include <linux/statfs.h> /* Added NCB 15-8-2003 */
#include <asm/statfs.h>
#define UnlockPage(p) unlock_page(p)
#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags)
-#define kdevname(x) cdevname(to_kdev_t(x))
+//#define kdevname(x) cdevname(to_kdev_t(x))
+#define kdevname(x) "(unavailable)" // temporary fix
+
#else
+
#include <linux/locks.h>
+
#endif
#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)
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
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);
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);
/*
* Lookup is used to find objects in the fs
*/
-#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 struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *n)
#else
static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry)
// 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);
}
inode->i_uid = obj->st_uid;
inode->i_gid = obj->st_gid;
inode->i_blksize = inode->i_sb->s_blocksize;
-#if defined(CONFIG_KERNEL_2_5)
- inode->i_rdev = to_kdev_t(obj->st_rdev);
+//#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+
+ inode->i_rdev = old_decode_dev(obj->st_rdev);
inode->i_atime.tv_sec = (time_t)(obj->st_atime);
inode->i_atime.tv_nsec = 0;
inode->i_mtime.tv_sec = (time_t)obj->st_mtime;
/*
* File creation. Allocate an inode, and we're done..
*/
-#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 rdev)
#else
static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev)
return retVal;
}
-#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)
#else
static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
return error;
}
-#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)
// like it has the right capabilities
// Set the yaffs_Device up for ram emulation
-#if defined(CONFIG_KERNEL_2_5)
+//#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL);
#else
sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL);
#ifdef CONFIG_YAFFS_MTD_ENABLED
-#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)
{
#ifdef CONFIG_YAFFS_RAM_ENABLED
-#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_ram_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data)
{