From: charles <charles>
Date: Mon, 20 Sep 2004 22:00:20 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://yaffs.net/gitweb/?p=yaffs%2F.git;a=commitdiff_plain;h=c996f73a5373577ccb196f5be5e04c0e1698208e

*** empty log message ***
---

diff --git a/yaffs_fs.c b/yaffs_fs.c
index 3fa410b..099a108 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.33 2004-09-19 08:14:50 charles Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.34 2004-09-20 22:00:20 charles Exp $";
 extern const char *yaffs_guts_c_version;
 
 
@@ -92,7 +92,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 +110,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 +123,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 +132,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);