From 57aa4494d3652c61037296f06c516c631468f87f Mon Sep 17 00:00:00 2001 From: charles Date: Sun, 19 Sep 2004 08:14:50 +0000 Subject: [PATCH] *** empty log message *** --- yaffs_fs.c | 39 +++++++++++++++++++++++++++------------ yaffs_mtdif.c | 6 +++++- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/yaffs_fs.c b/yaffs_fs.c index c0b101a..3fa410b 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -28,7 +28,7 @@ */ -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.33 2004-09-19 08:14:50 charles Exp $"; extern const char *yaffs_guts_c_version; @@ -47,14 +47,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 @@ -281,7 +286,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) @@ -581,8 +588,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 +840,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 +928,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 +1152,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 +1373,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 +1465,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) { @@ -1481,7 +1495,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) { diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c index 0dfe12d..6dede1a 100644 --- a/yaffs_mtdif.c +++ b/yaffs_mtdif.c @@ -13,7 +13,7 @@ * */ -const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.9 2003-04-08 19:53:44 charles Exp $"; +const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.10 2004-09-19 08:14:50 charles Exp $"; #ifdef CONFIG_YAFFS_MTD_ENABLED @@ -31,6 +31,10 @@ const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.9 2003-04-08 19:53:4 struct nand_oobinfo yaffs_oobinfo = { useecc: 1, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8)) +// this is for versions of mtd nand driver in kernel 2.6.8 and later + eccbytes: 6, +#endif eccpos: {8, 9, 10, 13, 14, 15} }; -- 2.30.2