X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=e0de160c01874a262234ca4d9a5fba14b9a2264a;hp=2639e9fc39334aadf04e88b726b177833f2eeb48;hb=b84b58688d72beb7ab3e046f9658b430e2dc3666;hpb=dc10a95f27049afbcee274da78fcb9c3dc08dd23 diff --git a/yaffs_fs.c b/yaffs_fs.c index 2639e9f..e0de160 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -30,11 +30,10 @@ */ -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 #include #include @@ -57,12 +56,13 @@ extern const char *yaffs_guts_c_version; #include #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 +#define BDEVNAME_SIZE 0 +#define yaffs_devname(sb, buf) kdevname(sb->s_dev) #endif @@ -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 #include "yaffs_mtdif.h" #include "yaffs_mtdif2.h" -#endif //CONFIG_YAFFS_MTD_ENABLED +#endif //CONFIG_YAFFS_YAFFS1 //#define T(x) printk x @@ -191,7 +191,7 @@ static struct inode_operations yaffs_file_inode_operations = { .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, @@ -1289,7 +1289,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) { @@ -1313,6 +1313,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam struct inode * inode = NULL; struct dentry * root; yaffs_Device *dev = 0; + char devname_buf[BDEVNAME_SIZE+1]; int err; sb->s_magic = YAFFS_MAGIC; @@ -1322,20 +1323,15 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam 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))); @@ -1404,11 +1400,11 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam } 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) @@ -1603,7 +1599,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) @@ -1636,9 +1632,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) @@ -1671,7 +1667,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 @@ -1743,7 +1739,6 @@ static DECLARE_FSTYPE(yaffs2_ram_fs_type, "yaffs2ram", yaffs2_ram_read_super, FS 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) { @@ -1826,6 +1821,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 +1835,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 +1852,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}