X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=yaffs_fs.c;h=0486c14a00661926c4890b10454165d0b81e1de1;hb=efaca198e4520ddd402d0ae5e118ceafea25a2f4;hp=c0b101ae6688becef805553f9c2eb4bae03b03a0;hpb=a9560949315e843e724b87af545c8cd0940ba5f6;p=yaffs%2F.git diff --git a/yaffs_fs.c b/yaffs_fs.c index c0b101a..0486c14 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.32 2003-10-29 20:42:34 charles Exp $"; +const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.36 2004-12-23 18:06:45 charles Exp $"; extern const char *yaffs_guts_c_version; @@ -47,14 +48,19 @@ extern const char *yaffs_guts_c_version; #include -#if defined(CONFIG_KERNEL_2_5) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + #include /* Added NCB 15-8-2003 */ #include #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 + #endif @@ -87,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) @@ -104,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 @@ -116,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); @@ -124,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); @@ -171,6 +182,10 @@ static struct file_operations yaffs_file_operations = { mmap: generic_file_mmap, flush: yaffs_file_flush, fsync: yaffs_sync_object, + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + sendfile: generic_file_sendfile, +#endif }; @@ -281,7 +296,9 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,yaffs_Ob /* * 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) @@ -352,15 +369,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); } @@ -581,8 +612,10 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) 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; @@ -831,7 +864,8 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) /* * 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) @@ -918,7 +952,8 @@ static int yaffs_mkdir(struct inode * dir, struct dentry * dentry, int mode) 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) @@ -1141,7 +1176,8 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) 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) @@ -1361,7 +1397,8 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl // 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); @@ -1452,7 +1489,8 @@ static int yaffs_internal_read_super_mtd(struct super_block * sb, void * data, i #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) { @@ -1465,8 +1503,8 @@ static struct file_system_type yaffs_fs_type = { .owner = THIS_MODULE, .name = "yaffs", .get_sb = yaffs_read_super, -// .kill_sb = kill_block_super, - .kill_sb = kill_litter_super, + .kill_sb = kill_block_super, +// .kill_sb = kill_litter_super, .fs_flags = FS_REQUIRES_DEV, }; #else @@ -1481,7 +1519,8 @@ static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV) #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) { @@ -1494,8 +1533,8 @@ static struct file_system_type yaffs_fs_type = { .owner = THIS_MODULE, .name = "yaffsram", .get_sb = yaffs_ram_read_super, -// .kill_sb = kill_block_super, - .kill_sb = kill_litter_super, + .kill_sb = kill_block_super, +// .kill_sb = kill_litter_super, .fs_flags = FS_SINGLE, }; #else