*/
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.17 2005-07-31 04:08:08 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;
#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
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;
}
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS1
static void yaffs_MTDPutSuper(struct super_block *sb)
{
-#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)));
}
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",
-#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)
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)
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
static struct proc_dir_entry *my_proc_entry;
-static struct proc_dir_entry *my_proc_ram_write_entry;
static char * yaffs_dump_dev(char *buf,yaffs_Device *dev)
{
return buf-page < count ? buf-page : count;
}
+#ifdef CONFIG_YAFFS2_RAM_ENABLED
static int yaffs_proc_ram_write(
char *page,
char **start,
printk(KERN_DEBUG "yaffs write size %d\n",count);
return count;
}
-
-
+#endif
// Stuff to handle installation of file systems
struct file_system_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}