X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=7d6e946df634382b592f15f24d45e4da066db9cf;hp=ca7839136474a7dee097387f6059179415c9e4f5;hb=5a981cb2a89a6e3e6fd3a1b19f2d74b4a96e5cbd;hpb=dcc469f5f4c2a26d7656d752739958a7e2329699

diff --git a/yaffs_fs.c b/yaffs_fs.c
index ca78391..7d6e946 100644
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -30,7 +30,7 @@
  */
 
 
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.18 2005-07-31 04:09:26 marty Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.21 2005-08-01 20:49:38 luc Exp $";
 extern const char *yaffs_guts_c_version;
 
 
@@ -88,11 +88,11 @@ unsigned yaffs_traceMask = YAFFS_TRACE_ALWAYS | YAFFS_TRACE_BAD_BLOCKS;
 #include "yaffs_nandemul2k.h"
 #endif
 
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS1
 #include <linux/mtd/mtd.h>
 #include "yaffs_mtdif.h"
 #include "yaffs_mtdif2.h"
-#endif //CONFIG_YAFFS_MTD_ENABLED
+#endif //CONFIG_YAFFS_YAFFS1
 
 //#define T(x) printk x
 
@@ -701,55 +701,6 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,yaffs_Ob
 	return inode;
 }
 
-#if 0
-
-// No longer used because we use generic rw */
-static ssize_t yaffs_file_read(struct file *f, char *buf, size_t n, loff_t *pos)
-{
-	yaffs_Object *obj;
-	int nRead,ipos;
-	struct inode *inode;
-	yaffs_Device *dev;
-	
-	T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read\n"));
-
-	obj  = yaffs_DentryToObject(f->f_dentry);
-	
-	dev = obj->myDev;
-	
-	yaffs_GrossLock(dev);
-	
-	inode = f->f_dentry->d_inode;
-	
-	if (*pos < inode->i_size) 
-	{
-			if (*pos + n > inode->i_size)
-			{
-				n = inode->i_size - *pos;
-			}
-	}
-	else
-	{
-		n = 0;
-	}
-	
-	nRead = yaffs_ReadDataFromFile(obj,buf,*pos,n);
-	if(nRead > 0)
-	{
-		f->f_pos += nRead;
-	}
-	
-	yaffs_GrossUnlock(dev);
-	
-	ipos = *pos;
-	
-	T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read read %d bytes, %d read at %d\n",n,nRead,ipos));
-	return nRead;
-	
-}
-
-#endif
-
 static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_t *pos)
 {
 	yaffs_Object *obj;
@@ -1289,7 +1240,7 @@ static void yaffs_put_super(struct super_block *sb)
 }
 
 
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS1
 
 static void  yaffs_MTDPutSuper(struct super_block *sb)
 {
@@ -1330,13 +1281,8 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam
 
 	
 
-#ifdef CONFIG_YAFFS_USE_CHUNK_SIZE
-	sb->s_blocksize = YAFFS_BYTES_PER_CHUNK;
-	sb->s_blocksize_bits = YAFFS_CHUNK_SIZE_SHIFT;
-#else
 	sb->s_blocksize = PAGE_CACHE_SIZE;
 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
-#endif
 	T(YAFFS_TRACE_OS,("yaffs_read_super: Using yaffs%d\n",yaffsVersion));
 	T(YAFFS_TRACE_OS,("yaffs_read_super: %s block size %d\n", useRam ? "RAM" : "MTD",(int)(sb->s_blocksize)));
 
@@ -1405,7 +1351,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam
 	}
 	else
 	{	
-#if defined(CONFIG_YAFFS_MTD_ENABLED) || defined(CONFIG_YAFFS2_MTD_ENABLED)
+#if defined(CONFIG_YAFFS_YAFFS1) || defined(CONFIG_YAFFS_YAFFS2)
 		struct mtd_info *mtd;
 		
 		T(YAFFS_TRACE_ALWAYS,("yaffs: Attempting MTD mount on %u.%u, \"%s\"\n",
@@ -1604,7 +1550,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam
 
 
 
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS1
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 static int yaffs_internal_read_super_mtd(struct super_block * sb, void * data, int silent)
@@ -1637,9 +1583,9 @@ static struct super_block *yaffs_read_super(struct super_block * sb, void * data
 static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV);
 #endif
 
-#endif // CONFIG_YAFFS_MTD_ENABLED
+#endif // CONFIG_YAFFS_YAFFS1
 
-#ifdef CONFIG_YAFFS2_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS2
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 static int yaffs2_internal_read_super_mtd(struct super_block * sb, void * data, int silent)
@@ -1672,7 +1618,7 @@ static struct super_block *yaffs2_read_super(struct super_block * sb, void * dat
 static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, FS_REQUIRES_DEV);
 #endif
 
-#endif // CONFIG_YAFFS2_MTD_ENABLED
+#endif // CONFIG_YAFFS_YAFFS2
 
 
 #ifdef CONFIG_YAFFS_RAM_ENABLED
@@ -1826,6 +1772,7 @@ static int  yaffs_proc_read(
 	return buf-page < count ? buf-page : count;
 }
 
+#ifdef CONFIG_YAFFS2_RAM_ENABLED
 static int  yaffs_proc_ram_write(
         char *page,
 	char **start,
@@ -1839,8 +1786,7 @@ static int  yaffs_proc_ram_write(
 	printk(KERN_DEBUG "yaffs write size %d\n",count);
 	return count;
 }
-
-
+#endif
 
 // Stuff to handle installation of file systems
 struct file_system_to_install
@@ -1857,10 +1803,10 @@ static struct file_system_to_install fs_to_install[] =
 #ifdef CONFIG_YAFFS2_RAM_ENABLED
      { &yaffs2_ram_fs_type,0},
 #endif
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS1
      { &yaffs_fs_type,0},
 #endif
-#ifdef CONFIG_YAFFS2_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS2
      { &yaffs2_fs_type,0},
 #endif
      { NULL,0}