*/
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.14 2005-07-29 20:25:43 luc Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.20 2005-07-31 08:38:41 marty Exp $";
extern const char *yaffs_guts_c_version;
-
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#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) "(unavailable)" // temporary fix
+#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) // FIXME: use sb->s_id instead ?
#else
#include <linux/locks.h>
+#define BDEVNAME_SIZE 0
+#define yaffs_devname(sb, buf) kdevname(sb->s_dev)
#endif
#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
.setattr = yaffs_setattr,
};
-struct inode_operations yaffs_symlink_inode_operations = {
+static struct inode_operations yaffs_symlink_inode_operations = {
.readlink = yaffs_readlink,
.follow_link = yaffs_follow_link,
.setattr = yaffs_setattr,
}
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_YAFFS1
static void yaffs_MTDPutSuper(struct super_block *sb)
{
struct inode * inode = NULL;
struct dentry * root;
yaffs_Device *dev = 0;
+ char devname_buf[BDEVNAME_SIZE+1];
int err;
sb->s_magic = YAFFS_MAGIC;
printk(KERN_INFO"yaffs: sb is NULL\n");
else if(!sb->s_dev)
printk(KERN_INFO"yaffs: sb->s_dev is NULL\n");
- else if(! kdevname(sb->s_dev))
- printk(KERN_INFO"yaffs: kdevname is NULL\n");
+ else if(!yaffs_devname(sb, devname_buf))
+ printk(KERN_INFO"yaffs: devname is NULL\n");
else
- printk(KERN_INFO"yaffs: dev is %d name is \"%s\"\n", sb->s_dev, kdevname(sb->s_dev));
+ printk(KERN_INFO"yaffs: dev is %d name is \"%s\"\n", sb->s_dev, yaffs_devname(sb, devname_buf));
-#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
{
-#ifdef CONFIG_YAFFS_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",
- MAJOR(sb->s_dev),MINOR(sb->s_dev),kdevname(sb->s_dev)));
+ MAJOR(sb->s_dev),MINOR(sb->s_dev), yaffs_devname(sb, devname_buf)));
// Check it's an mtd device.....
if(MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
-#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}