*/
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.19 2005-07-31 06:47:12 marty Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.23 2005-08-01 20:52:35 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
#define yaffs_InodeToObject(iptr) ((yaffs_Object *)((iptr)->u.generic_ip))
#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 (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->s_fs_info)
#else
static void yaffs_put_super(struct super_block *sb);
-#if 0
-static ssize_t yaffs_file_read(struct file *f, char *buf, size_t n, loff_t *pos);
-#endif
-
static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_t *pos);
static int yaffs_file_flush(struct file* file);
static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
-//#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);
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 (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_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 (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
#else
/*
* Lookup is used to find objects in the fs
*/
-//#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)
inode->i_uid = obj->yst_uid;
inode->i_gid = obj->yst_gid;
inode->i_blksize = inode->i_sb->s_blocksize;
-//#if defined(CONFIG_KERNEL_2_5)
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
inode->i_rdev = old_decode_dev(obj->yst_rdev);
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;
/*
* File creation. Allocate an inode, and we're done..
*/
-//#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
return retVal;
}
-//#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
return error;
}
-//#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
}
-#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",
!mtd->block_markbad ||
!mtd->read ||
!mtd->write ||
-#ifndef CONFIG_YAFFS_USE_OLD_MTD
!mtd->write_ecc ||
!mtd->read_ecc ||
-#endif
!mtd->read_oob ||
!mtd->write_oob )
{
if(!mtd->erase ||
!mtd->read ||
!mtd->write ||
-#ifndef CONFIG_YAFFS_USE_OLD_MTD
!mtd->write_ecc ||
!mtd->read_ecc ||
-#endif
!mtd->read_oob ||
!mtd->write_oob )
{
// like it has the right capabilities
// Set the yaffs_Device up for mtd
-//#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
-#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)
return get_sb_bdev(fs, flags, dev_name, data, yaffs_internal_read_super_mtd);
}
-/* changes NCB 2.5.70 */
-//static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV);
static struct file_system_type yaffs_fs_type = {
.owner = THIS_MODULE,
.name = "yaffs",
.get_sb = yaffs_read_super,
.kill_sb = kill_block_super,
-// .kill_sb = kill_litter_super,
.fs_flags = FS_REQUIRES_DEV,
};
#else
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)
return get_sb_bdev(fs, flags, dev_name, data, yaffs2_internal_read_super_mtd);
}
-/* changes NCB 2.5.70 */
-//static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV);
static struct file_system_type yaffs2_fs_type = {
.owner = THIS_MODULE,
.name = "yaffs2",
.get_sb = yaffs2_read_super,
.kill_sb = kill_block_super,
-// .kill_sb = kill_litter_super,
.fs_flags = FS_REQUIRES_DEV,
};
#else
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
#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}
projects / yaffs2.git / blobdiff