*/
-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;
#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
/*
* 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)
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)
{