X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=3f8cf2a9f14be85a1912c7a948f1be580b76ea27;hp=a697752e24c2f490bcdb8560bebed9fccf8370b0;hb=e528916d3c9c87aa1547b1cc2536389ef5efbcb3;hpb=28d4bda659460575eb5fcf7de394209531f1a950;ds=sidebyside diff --git a/yaffs_fs.c b/yaffs_fs.c index a697752..3f8cf2a 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.8 2005-07-18 23:16:04 charles 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 #include #include @@ -44,6 +43,7 @@ extern const char *yaffs_guts_c_version; #include #include #include +#include #include #include #include @@ -56,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 @@ -87,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 @@ -99,9 +100,7 @@ unsigned yaffs_traceMask = YAFFS_TRACE_ALWAYS | YAFFS_TRACE_BAD_BLOCKS; #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 @@ -111,10 +110,6 @@ unsigned yaffs_traceMask = YAFFS_TRACE_ALWAYS | YAFFS_TRACE_BAD_BLOCKS; 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); @@ -123,7 +118,6 @@ static int yaffs_sync_object(struct file * file, struct dentry *dentry, int data 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); @@ -136,7 +130,6 @@ static int yaffs_unlink(struct inode * dir, struct dentry *dentry); 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 @@ -145,7 +138,6 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int d 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 @@ -153,87 +145,75 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf); #endif static void yaffs_read_inode (struct inode *inode); -//#if defined(CONFIG_KERNEL_2_5) -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) -static struct super_block *yaffs_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data); -#else -static struct super_block *yaffs_read_super(struct super_block * sb, void * data, int silent); -#endif - static void yaffs_put_inode (struct inode *inode); static void yaffs_delete_inode(struct inode *); static void yaffs_clear_inode(struct inode *); static int yaffs_readpage(struct file *file, struct page * page); +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) +static int yaffs_writepage(struct page *page, struct writeback_control *wbc); +#else static int yaffs_writepage(struct page *page); +#endif static int yaffs_prepare_write(struct file *f, struct page *pg, unsigned offset, unsigned to); static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, unsigned to); -static int yaffs_readlink(struct dentry *dentry, char *buffer, int buflen); +static int yaffs_readlink(struct dentry *dentry, char __user *buffer, int buflen); static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); - static struct address_space_operations yaffs_file_address_operations = { - readpage: yaffs_readpage, - writepage: yaffs_writepage, - prepare_write: yaffs_prepare_write, - commit_write: yaffs_commit_write + .readpage = yaffs_readpage, + .writepage = yaffs_writepage, + .prepare_write = yaffs_prepare_write, + .commit_write = yaffs_commit_write, }; - static struct file_operations yaffs_file_operations = { - - read: generic_file_read, - write: generic_file_write, - - mmap: generic_file_mmap, - flush: yaffs_file_flush, - fsync: yaffs_sync_object, + .read = generic_file_read, + .write = generic_file_write, + .mmap = generic_file_mmap, + .flush = yaffs_file_flush, + .fsync = yaffs_sync_object, }; - static struct inode_operations yaffs_file_inode_operations = { - setattr: yaffs_setattr, + .setattr = yaffs_setattr, }; - -struct inode_operations yaffs_symlink_inode_operations = -{ - readlink: yaffs_readlink, - follow_link: yaffs_follow_link, - setattr: yaffs_setattr +static struct inode_operations yaffs_symlink_inode_operations = { + .readlink = yaffs_readlink, + .follow_link = yaffs_follow_link, + .setattr = yaffs_setattr, }; static struct inode_operations yaffs_dir_inode_operations = { - create: yaffs_create, - lookup: yaffs_lookup, - link: yaffs_link, - unlink: yaffs_unlink, - symlink: yaffs_symlink, - mkdir: yaffs_mkdir, - rmdir: yaffs_unlink, - mknod: yaffs_mknod, - rename: yaffs_rename, - setattr: yaffs_setattr, + .create = yaffs_create, + .lookup = yaffs_lookup, + .link = yaffs_link, + .unlink = yaffs_unlink, + .symlink = yaffs_symlink, + .mkdir = yaffs_mkdir, + .rmdir = yaffs_unlink, + .mknod = yaffs_mknod, + .rename = yaffs_rename, + .setattr = yaffs_setattr, }; static struct file_operations yaffs_dir_operations = { - read: generic_read_dir, - readdir: yaffs_readdir, - fsync: yaffs_sync_object, + .read = generic_read_dir, + .readdir = yaffs_readdir, + .fsync = yaffs_sync_object, }; - static struct super_operations yaffs_super_ops = { - statfs: yaffs_statfs, - read_inode: yaffs_read_inode, - put_inode: yaffs_put_inode, - put_super: yaffs_put_super, -// remount_fs: - delete_inode: yaffs_delete_inode, - clear_inode: yaffs_clear_inode, + .statfs = yaffs_statfs, + .read_inode = yaffs_read_inode, + .put_inode = yaffs_put_inode, + .put_super = yaffs_put_super, + .delete_inode = yaffs_delete_inode, + .clear_inode = yaffs_clear_inode, }; @@ -252,7 +232,7 @@ static void yaffs_GrossUnlock(yaffs_Device *dev) } -static int yaffs_readlink(struct dentry *dentry, char *buffer, int buflen) +static int yaffs_readlink(struct dentry *dentry, char __user *buffer, int buflen) { unsigned char *alias; int ret; @@ -301,7 +281,6 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,yaffs_Ob /* * 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) @@ -463,8 +442,12 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg) dev = obj->myDev; +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + BUG_ON(!PageLocked(pg)); +#else if (!PageLocked(pg)) PAGE_BUG(pg); +#endif pg_buf = kmap(pg); /* FIXME: Can kmap fail? */ @@ -508,7 +491,11 @@ static int yaffs_readpage(struct file *f, struct page * pg) // writepage inspired by/stolen from smbfs // +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) +static int yaffs_writepage(struct page *page, struct writeback_control *wbc) +#else static int yaffs_writepage(struct page *page) +#endif { struct address_space *mapping = page->mapping; struct inode *inode; @@ -617,7 +604,6 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) 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); @@ -648,7 +634,8 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) init_special_inode(inode, obj->yst_mode,old_decode_dev(obj->yst_rdev)); #else init_special_inode(inode, obj->yst_mode,(dev_t)(obj->yst_rdev)); -#endif break; +#endif + break; case S_IFREG: // file inode->i_op = &yaffs_file_inode_operations; inode->i_fop = &yaffs_file_operations; @@ -703,55 +690,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; @@ -891,7 +829,6 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) /* * 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 @@ -906,6 +843,8 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r yaffs_Object *parent = yaffs_InodeToObject(dir); int error = -ENOSPC; + uid_t uid = current->fsuid; + gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid; if(parent) { @@ -931,17 +870,18 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r // Special (socket, fifo, device...) T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making special\n")); #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) - obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,old_encode_dev(rdev)); + obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,uid, gid,old_encode_dev(rdev)); #else - obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,rdev); -#endif break; + obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,uid, gid,rdev); +#endif + break; case S_IFREG: // file T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n")); - obj = yaffs_MknodFile(parent,dentry->d_name.name,mode,current->uid, current->gid); + obj = yaffs_MknodFile(parent,dentry->d_name.name,mode,uid, gid); break; case S_IFDIR: // directory T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making directory\n")); - obj = yaffs_MknodDirectory(parent,dentry->d_name.name,mode,current->uid, current->gid); + obj = yaffs_MknodDirectory(parent,dentry->d_name.name,mode,uid, gid); break; case S_IFLNK: // symlink T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n")); @@ -982,7 +922,6 @@ static int yaffs_mkdir(struct inode * dir, struct dentry * dentry, int mode) 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 @@ -1077,13 +1016,15 @@ static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char * { yaffs_Object *obj; yaffs_Device *dev; + uid_t uid = current->fsuid; + gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid; T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_symlink\n")); dev = yaffs_InodeToObject(dir)->myDev; yaffs_GrossLock(dev); obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name, - S_IFLNK | S_IRWXUGO, current->uid, current->gid, + S_IFLNK | S_IRWXUGO, uid, gid, symname); yaffs_GrossUnlock(dev); @@ -1201,12 +1142,12 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) error = -EPERM; } yaffs_GrossUnlock(dev); - error = inode_setattr(inode,attr); + if (!error) + error = inode_setattr(inode,attr); } 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 @@ -1264,14 +1205,7 @@ static void yaffs_read_inode (struct inode *inode) } - - -// Todo -// Currently we only can report a single partition. Need to use lists here -static yaffs_Device *yaffs_dev; -static yaffs_Device *yaffsram_dev; - - +static LIST_HEAD(yaffs_dev_list); static void yaffs_put_super(struct super_block *sb) { @@ -1285,14 +1219,14 @@ static void yaffs_put_super(struct super_block *sb) yaffs_Deinitialise(dev); yaffs_GrossUnlock(dev); - if(dev == yaffs_dev) yaffs_dev = NULL; - if(dev == yaffsram_dev) yaffsram_dev = NULL; - + /* we assume this is protected by lock_kernel() in mount/umount */ + list_del(&dev->devList); + kfree(dev); } -#ifdef CONFIG_YAFFS_MTD_ENABLED +#ifdef CONFIG_YAFFS_YAFFS1 static void yaffs_MTDPutSuper(struct super_block *sb) { @@ -1315,7 +1249,8 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam int nBlocks; struct inode * inode = NULL; struct dentry * root; - yaffs_Device *dev; + yaffs_Device *dev = 0; + char devname_buf[BDEVNAME_SIZE+1]; int err; sb->s_magic = YAFFS_MAGIC; @@ -1325,20 +1260,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))); @@ -1370,6 +1300,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam memset(dev,0,sizeof(yaffs_Device)); dev->genericDevice = NULL; // Not used for RAM emulation. + dev->name = sb->s_type->name; nBlocks = YAFFS_RAM_EMULATION_SIZE / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK); dev->startBlock = 0; @@ -1401,19 +1332,16 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam dev->initialiseNAND = nandemul_InitialiseNAND; dev->isYaffs2 = 0; } - - yaffsram_dev = dev; - #endif } 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) @@ -1436,13 +1364,13 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam return NULL; } - T(YAFFS_TRACE_OS,(" erase %x\n",mtd->erase)); - T(YAFFS_TRACE_OS,(" read %x\n",mtd->read)); - T(YAFFS_TRACE_OS,(" write %x\n",mtd->write)); - T(YAFFS_TRACE_OS,(" readoob %x\n",mtd->read_oob)); - T(YAFFS_TRACE_OS,(" writeoob %x\n",mtd->write_oob)); - T(YAFFS_TRACE_OS,(" block_isbad %x\n",mtd->block_isbad)); - T(YAFFS_TRACE_OS,(" block_markbad %x\n",mtd->block_markbad)); + T(YAFFS_TRACE_OS,(" erase %p\n",mtd->erase)); + T(YAFFS_TRACE_OS,(" read %p\n",mtd->read)); + T(YAFFS_TRACE_OS,(" write %p\n",mtd->write)); + T(YAFFS_TRACE_OS,(" readoob %p\n",mtd->read_oob)); + T(YAFFS_TRACE_OS,(" writeoob %p\n",mtd->write_oob)); + T(YAFFS_TRACE_OS,(" block_isbad %p\n",mtd->block_isbad)); + T(YAFFS_TRACE_OS,(" block_markbad %p\n",mtd->block_markbad)); T(YAFFS_TRACE_OS,(" oobblock %d\n",mtd->oobblock)); T(YAFFS_TRACE_OS,(" oobsize %d\n",mtd->oobsize)); T(YAFFS_TRACE_OS,(" erasesize %d\n",mtd->erasesize)); @@ -1456,10 +1384,8 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam !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 ) { @@ -1479,10 +1405,8 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam 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 ) { @@ -1503,7 +1427,6 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam // 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 @@ -1518,6 +1441,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam memset(dev,0,sizeof(yaffs_Device)); dev->genericDevice = mtd; + dev->name = mtd->name; // Set up the memory size parameters.... @@ -1560,12 +1484,12 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam #ifdef CONFIG_YAFFS_USE_NANDECC dev->useNANDECC = 1; #endif - - yaffs_dev = dev; - #endif } + /* we assume this is protected by lock_kernel() in mount/umount */ + list_add_tail(&dev->devList, &yaffs_dev_list); + init_MUTEX(&dev->grossLock); @@ -1606,43 +1530,26 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,int useRam } -static int yaffs_internal_read_super_ram(struct super_block * sb, void * data, int silent) -{ - return yaffs_internal_read_super(1,1,sb,data,silent) ? 0 : -1; -} + +#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 yaffs_internal_read_super(1,0,sb,data,silent) ? 0 : -1; } -static int yaffs2_internal_read_super_ram(struct super_block * sb, void * data, int silent) -{ - return yaffs_internal_read_super(2,1,sb,data,silent) ? 0 : -1; -} -static int yaffs2_internal_read_super_mtd(struct super_block * sb, void * data, int silent) -{ - return yaffs_internal_read_super(2,0,sb,data,silent) ? 0 : -1; -} - - - -#ifdef CONFIG_YAFFS_MTD_ENABLED -//#if defined(CONFIG_KERNEL_2_5) -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) static struct super_block *yaffs_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data) { 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 @@ -1654,25 +1561,27 @@ 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) +{ + return yaffs_internal_read_super(2,0,sb,data,silent) ? 0 : -1; +} + static struct super_block *yaffs2_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data) { 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 @@ -1684,16 +1593,21 @@ 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 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) +static int yaffs_internal_read_super_ram(struct super_block * sb, void * data, int silent) +{ + return yaffs_internal_read_super(1,1,sb,data,silent) ? 0 : -1; +} + static struct super_block *yaffs_ram_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data) { - return get_sb_bdev(fs, flags, dev_name, data, yaffs_internal_read_super_ram); + return get_sb_nodev(fs, flags, data, yaffs_internal_read_super_ram); } @@ -1701,8 +1615,7 @@ static struct file_system_type yaffs_ram_fs_type = { .owner = THIS_MODULE, .name = "yaffsram", .get_sb = yaffs_ram_read_super, - .kill_sb = kill_block_super, -// .kill_sb = kill_litter_super, + .kill_sb = kill_litter_super, .fs_flags = 0 , }; #else @@ -1719,10 +1632,15 @@ static DECLARE_FSTYPE(yaffs_ram_fs_type, "yaffsram", yaffs_ram_read_super, FS_SI #ifdef CONFIG_YAFFS2_RAM_ENABLED #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) +static int yaffs2_internal_read_super_ram(struct super_block * sb, void * data, int silent) +{ + return yaffs_internal_read_super(2,1,sb,data,silent) ? 0 : -1; +} + static struct super_block *yaffs2_ram_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data) { - return get_sb_bdev(fs, flags, dev_name, data, yaffs2_internal_read_super_ram); + return get_sb_nodev(fs, flags, data, yaffs2_internal_read_super_ram); } @@ -1730,8 +1648,7 @@ static struct file_system_type yaffs2_ram_fs_type = { .owner = THIS_MODULE, .name = "yaffs2ram", .get_sb = yaffs2_ram_read_super, - .kill_sb = kill_block_super, -// .kill_sb = kill_litter_super, + .kill_sb = kill_litter_super, .fs_flags = 0 , }; #else @@ -1748,11 +1665,9 @@ 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,char *name) +static char * yaffs_dump_dev(char *buf,yaffs_Device *dev) { - buf +=sprintf(buf,"\nDevice %s\n",name); buf +=sprintf(buf,"startBlock......... %d\n",dev->startBlock); buf +=sprintf(buf,"endBlock........... %d\n",dev->endBlock); buf +=sprintf(buf,"chunkGroupBits..... %d\n",dev->chunkGroupBits); @@ -1782,7 +1697,6 @@ static char * yaffs_dump_dev(char *buf,yaffs_Device *dev,char *name) buf +=sprintf(buf,"useNANDECC......... %d\n",dev->useNANDECC); buf +=sprintf(buf,"isYaffs2........... %d\n",dev->isYaffs2); - return buf; } @@ -1795,25 +1709,45 @@ static int yaffs_proc_read( void *data ) { + struct list_head *item; + char *buf = page; + int step = offset; + int n = 0; + + /* Get proc_file_read() to step 'offset' by one on each sucessive call. + * We use 'offset' (*ppos) to indicate where we are in devList. + * This also assumes the user has posted a read buffer large + * enough to hold the complete output; but that's life in /proc. + */ + + *(int *)start = 1; + + /* Print header first */ + if (step == 0) { + buf += sprintf(buf, "YAFFS built:" __DATE__ " "__TIME__ + "\n%s\n%s\n", yaffs_fs_c_version, yaffs_guts_c_version); + } - char my_buffer[3000]; - char *buf; - buf = my_buffer; - - if (offset > 0) return 0; + /* hold lock_kernel while traversing yaffs_dev_list */ + lock_kernel(); - /* Fill the buffer and get its length */ - buf +=sprintf(buf,"YAFFS built:"__DATE__ " "__TIME__"\n%s\n%s\n", yaffs_fs_c_version,yaffs_guts_c_version); - - if(yaffs_dev) buf = yaffs_dump_dev(buf,yaffs_dev,"yaffs"); - if(yaffsram_dev) buf = yaffs_dump_dev(buf,yaffsram_dev,"yaffsram"); - + /* Locate and print the Nth entry. Order N-squared but N is small. */ + list_for_each(item, &yaffs_dev_list) { + yaffs_Device *dev = list_entry(item, yaffs_Device, devList); + if (n < step) { + n++; + continue; + } + buf += sprintf(buf,"\nDevice %d \"%s\"\n", n, dev->name); + buf = yaffs_dump_dev(buf, dev); + break; + } + unlock_kernel(); - strcpy(page,my_buffer); - return strlen(my_buffer); + return buf-page < count ? buf-page : count; } - +#ifdef CONFIG_YAFFS2_RAM_ENABLED static int yaffs_proc_ram_write( char *page, char **start, @@ -1827,8 +1761,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 @@ -1845,10 +1778,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} @@ -1859,8 +1792,6 @@ static int __init init_yaffs_fs(void) int error = 0; struct file_system_to_install *fsinst; - yaffs_dev = yaffsram_dev = NULL; - T(YAFFS_TRACE_ALWAYS,("yaffs " __DATE__ " " __TIME__ " Installing. \n"));