X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs%2F.git;a=blobdiff_plain;f=yaffs_fs.c;h=86a2559a41f8127b72acaae48c635d6705310412;hp=637f7fd4b2940c3589a3b9f46ca5db931a39746b;hb=5a41b9c9c1a7068f579cce83c757af27999249e8;hpb=45172fe9a1f7fcee9a79d2543221292b83bec6f6 diff --git a/yaffs_fs.c b/yaffs_fs.c index 637f7fd..86a2559 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -24,11 +24,12 @@ * * Nick Bane for numerous patches. * * Nick Bane for 2.5/2.6 integration. * * Andras Toth for mknod rdev issue. + * * Michael Fischer for finding the problem with inode inconsistency. * * Some code bodily lifted from JFFS2. */ -const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.28 2003-08-20 03:53:39 charles Exp $"; +const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.39 2005-04-24 08:54:36 charles Exp $"; extern const char *yaffs_guts_c_version; @@ -47,14 +48,19 @@ extern const char *yaffs_guts_c_version; #include -#if defined(CONFIG_KERNEL_2_5) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + #include /* Added NCB 15-8-2003 */ #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) cdevname(to_kdev_t(x)) +#define kdevname(x) "(unavailable)" // temporary fix + #else + #include + #endif @@ -87,7 +93,8 @@ unsigned yaffs_traceMask = YAFFS_TRACE_ALWAYS | YAFFS_TRACE_BAD_BLOCKS; #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 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 #define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->u.generic_sbp) @@ -104,7 +111,8 @@ 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 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); #else @@ -116,7 +124,8 @@ 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 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_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev); @@ -124,14 +133,16 @@ 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 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 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 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); @@ -142,7 +153,7 @@ static void yaffs_delete_inode(struct inode *); static void yaffs_clear_inode(struct inode *); static int yaffs_readpage(struct file *file, struct page * page); - +static int yaffs_writepage(struct page *page); 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); @@ -154,6 +165,7 @@ 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 }; @@ -170,6 +182,10 @@ static struct file_operations yaffs_file_operations = { mmap: generic_file_mmap, flush: yaffs_file_flush, fsync: yaffs_sync_object, + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + sendfile: generic_file_sendfile, +#endif }; @@ -219,14 +235,14 @@ static struct super_operations yaffs_super_ops = { static void yaffs_GrossLock(yaffs_Device *dev) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs locking\n")); + T(YAFFS_TRACE_OS,("yaffs locking\n")); down(&dev->grossLock); } static void yaffs_GrossUnlock(yaffs_Device *dev) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs unlocking\n")); + T(YAFFS_TRACE_OS,("yaffs unlocking\n")); up(&dev->grossLock); } @@ -280,7 +296,9 @@ 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 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) #else static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry) @@ -295,7 +313,7 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry) yaffs_GrossLock(dev); - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup for %d:%s\n",yaffs_InodeToObject(dir)->objectId,dentry->d_name.name)); + T(YAFFS_TRACE_OS,("yaffs_lookup for %d:%s\n",yaffs_InodeToObject(dir)->objectId,dentry->d_name.name)); obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),dentry->d_name.name); @@ -305,13 +323,13 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry) if(obj) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup found %d\n",obj->objectId)); + T(YAFFS_TRACE_OS,("yaffs_lookup found %d\n",obj->objectId)); inode = yaffs_get_inode(dir->i_sb, obj->st_mode,0,obj); if(inode) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_loookup dentry \n")); + T(YAFFS_TRACE_OS,("yaffs_loookup dentry \n")); /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to d_add even if NULL inode */ #if 0 //dget(dentry); // try to solve directory bug @@ -327,7 +345,7 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry) } else { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup not found\n")); + T(YAFFS_TRACE_OS,("yaffs_lookup not found\n")); } yaffs_GrossUnlock(dev); @@ -344,22 +362,37 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry) // Put inode is called when the inode **structure** is put. static void yaffs_put_inode(struct inode *inode) { - T(YAFFS_TRACE_OS,("yaffs_put_inode: ino %d, count %d\n",(int)inode->i_ino, atomic_read(&inode->i_count))); + T(YAFFS_TRACE_OS,("yaffs_put_inode: ino %d, count %d nlink %d\n", + (int)inode->i_ino, atomic_read(&inode->i_count), inode->i_nlink)); } // clear is called to tell the fs to release any per-inode data it holds static void yaffs_clear_inode(struct inode *inode) { - yaffs_Object *obj = yaffs_InodeToObject(inode); + yaffs_Object *obj; + yaffs_Device *dev; + + obj = yaffs_InodeToObject(inode); T(YAFFS_TRACE_OS,("yaffs_clear_inode: ino %d, count %d %s\n",(int)inode->i_ino, atomic_read(&inode->i_count), obj ? "object exists" : "null object")); if(obj) { + dev = obj->myDev; + yaffs_GrossLock(dev); + + // Clear the association between the inode ant the yaffs_Object. obj->myInode = NULL; - inode->u.generic_ip = NULL; + inode->u.generic_ip = NULL; + + // If the object freeing was deferred, then the real free happens now. + // This should fix the inode inconsistency problem. + + yaffs_HandleDeferedFree(obj); + + yaffs_GrossUnlock(dev); } @@ -394,7 +427,7 @@ static int yaffs_file_flush(struct file* file) yaffs_Device *dev = obj->myDev; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_flush object %d (%s)\n",obj->objectId, + T(YAFFS_TRACE_OS,("yaffs_file_flush object %d (%s)\n",obj->objectId, obj->dirty ? "dirty" : "clean")); yaffs_GrossLock(dev); @@ -413,12 +446,12 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg) // Lifted from jffs2 yaffs_Object *obj; - unsigned char *pg_buf; + unsigned char *pg_buf; int ret; - + yaffs_Device *dev; - - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readpage at %08x, size %08x\n", + + T(YAFFS_TRACE_OS,("yaffs_readpage at %08x, size %08x\n", (unsigned)(pg->index << PAGE_CACHE_SHIFT), (unsigned)PAGE_CACHE_SIZE)); obj = yaffs_DentryToObject(f->f_dentry); @@ -452,7 +485,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg) kunmap(pg); - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readpage done\n")); + T(YAFFS_TRACE_OS,("yaffs_readpage done\n")); return ret; } @@ -468,11 +501,68 @@ static int yaffs_readpage(struct file *f, struct page * pg) return yaffs_readpage_unlock(f,pg); } +// writepage inspired by/stolen from smbfs +// + +static int yaffs_writepage(struct page *page) +{ + struct address_space *mapping = page->mapping; + struct inode *inode; + unsigned long end_index; + char *buffer; + yaffs_Object *obj; + int nWritten = 0; + unsigned nBytes; + + if (!mapping) + BUG(); + inode = mapping->host; + if (!inode) + BUG(); + + end_index = inode->i_size >> PAGE_CACHE_SHIFT; + + /* easy case */ + if (page->index < end_index) + { + nBytes = PAGE_CACHE_SIZE; + } + else + { + nBytes = inode->i_size & (PAGE_CACHE_SIZE-1); + } + // What's happening here? + ///* OK, are we completely out? */ + //if (page->index >= end_index+1 || !offset) + // return -EIO; + + get_page(page); + + + buffer = kmap(page); + + obj = yaffs_InodeToObject(inode); + yaffs_GrossLock(obj->myDev); + + + nWritten = yaffs_WriteDataToFile(obj,buffer,page->index << PAGE_CACHE_SHIFT,nBytes); + + yaffs_GrossUnlock(obj->myDev); + + kunmap(page); + SetPageUptodate(page); + UnlockPage(page); + put_page(page); + + return (nWritten == nBytes) ? 0 : -ENOSPC; +} + + static int yaffs_prepare_write(struct file *f, struct page *pg, unsigned offset, unsigned to) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_prepair_write\n")); + T(YAFFS_TRACE_OS,("yaffs_prepair_write\n")); if(!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE)) return yaffs_readpage_nolock(f,pg); @@ -491,13 +581,13 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, unsigned spos = pos; unsigned saddr = (unsigned)addr; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_commit_write addr %x pos %x nBytes %d\n",saddr,spos,nBytes)); + T(YAFFS_TRACE_OS,("yaffs_commit_write addr %x pos %x nBytes %d\n",saddr,spos,nBytes)); nWritten = yaffs_file_write(f,addr, nBytes, &pos); if(nWritten != nBytes) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_commit_write not same size nWritten %d nBytes %d\n",nWritten,nBytes)); + T(YAFFS_TRACE_OS,("yaffs_commit_write not same size nWritten %d nBytes %d\n",nWritten,nBytes)); SetPageError(pg); ClearPageUptodate(pg); } @@ -506,7 +596,7 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, SetPageUptodate(pg); } - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_commit_write returning %d\n",nWritten)); + T(YAFFS_TRACE_OS,("yaffs_commit_write returning %d\n",nWritten)); return nWritten; @@ -523,8 +613,10 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) inode->i_uid = obj->st_uid; inode->i_gid = obj->st_gid; inode->i_blksize = inode->i_sb->s_blocksize; -#if defined(CONFIG_KERNEL_2_5) - inode->i_rdev = to_kdev_t(obj->st_rdev); +//#if defined(CONFIG_KERNEL_2_5) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + + inode->i_rdev = old_decode_dev(obj->st_rdev); inode->i_atime.tv_sec = (time_t)(obj->st_atime); inode->i_atime.tv_nsec = 0; inode->i_mtime.tv_sec = (time_t)obj->st_mtime; @@ -538,17 +630,21 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) inode->i_ctime = obj->st_ctime; #endif inode->i_size = yaffs_GetObjectFileLength(obj); - inode->i_blocks = (inode->i_size + inode->i_blksize - 1) >> inode->i_sb->s_blocksize_bits; + inode->i_blocks = (inode->i_size + 511) >> 9; inode->i_nlink = yaffs_GetObjectLinkCount(obj); - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_FillInode mode %x uid %d gid %d size %d count %d\n", + T(YAFFS_TRACE_OS,("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n", inode->i_mode, inode->i_uid, inode->i_gid, (int)inode->i_size, atomic_read(&inode->i_count))); switch (obj->st_mode & S_IFMT) { default: // fifo, device or socket - init_special_inode(inode, obj->st_mode,(dev_t)(obj->st_rdev)); +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + init_special_inode(inode, obj->st_mode,old_decode_dev(obj->st_rdev)); +#else + init_special_inode(inode, obj->st_mode,(dev_t)(obj->st_rdev)); +#endif break; case S_IFREG: // file inode->i_op = &yaffs_file_inode_operations; @@ -571,7 +667,7 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) } else { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_FileInode invalid parameters\n")); + T(YAFFS_TRACE_OS,("yaffs_FileInode invalid parameters\n")); } } @@ -580,7 +676,7 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,yaffs_Ob { struct inode * inode; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_get_inode for object %d\n",obj->objectId)); + T(YAFFS_TRACE_OS,("yaffs_get_inode for object %d\n",obj->objectId)); inode = iget(sb,obj->objectId); @@ -597,7 +693,7 @@ static ssize_t yaffs_file_read(struct file *f, char *buf, size_t n, loff_t *pos) struct inode *inode; yaffs_Device *dev; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read\n")); + T(YAFFS_TRACE_OS,("yaffs_file_read\n")); obj = yaffs_DentryToObject(f->f_dentry); @@ -629,7 +725,7 @@ static ssize_t yaffs_file_read(struct file *f, char *buf, size_t n, loff_t *pos) ipos = *pos; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read read %d bytes, %d read at %d\n",n,nRead,ipos)); + T(YAFFS_TRACE_OS,("yaffs_file_read read %d bytes, %d read at %d\n",n,nRead,ipos)); return nRead; } @@ -648,7 +744,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_ dev = obj->myDev; yaffs_GrossLock(dev); - + inode = f->f_dentry->d_inode; if(!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) @@ -663,16 +759,16 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_ if(!obj) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write: hey obj is null!\n")); + T(YAFFS_TRACE_OS,("yaffs_file_write: hey obj is null!\n")); } else { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write about to write writing %d bytes to object %d at %d\n",n,obj->objectId,ipos)); + T(YAFFS_TRACE_OS,("yaffs_file_write about to write writing %d bytes to object %d at %d\n",n,obj->objectId,ipos)); } nWritten = yaffs_WriteDataToFile(obj,buf,ipos,n); - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write writing %d bytes, %d written at %d\n",n,nWritten,ipos)); + T(YAFFS_TRACE_OS,("yaffs_file_write writing %d bytes, %d written at %d\n",n,nWritten,ipos)); if(nWritten > 0) { ipos += nWritten; @@ -680,15 +776,15 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_ if(ipos > inode->i_size) { inode->i_size = ipos; - inode->i_blocks = (ipos + inode->i_blksize - 1)/ inode->i_blksize; + inode->i_blocks = (ipos + 511)>>9; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write size updated to %d bytes, %d blocks\n",ipos,(int)(inode->i_blocks))); + T(YAFFS_TRACE_OS,("yaffs_file_write size updated to %d bytes, %d blocks\n",ipos,(int)(inode->i_blocks))); } } yaffs_GrossUnlock(dev); - return nWritten != n ? -ENOSPC : nWritten; + return nWritten != n ? -ENOSPC : nWritten; } @@ -714,7 +810,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) if(offset == 0) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readdir: entry . ino %d \n",(int)inode->i_ino)); + T(YAFFS_TRACE_OS,("yaffs_readdir: entry . ino %d \n",(int)inode->i_ino)); if(filldir(dirent,".",1,offset,inode->i_ino,DT_DIR) < 0) { goto out; @@ -724,7 +820,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) } if(offset == 1) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readdir: entry .. ino %d \n",(int)f->f_dentry->d_parent->d_inode->i_ino)); + T(YAFFS_TRACE_OS,("yaffs_readdir: entry .. ino %d \n",(int)f->f_dentry->d_parent->d_inode->i_ino)); if(filldir(dirent,"..",2,offset,f->f_dentry->d_parent->d_inode->i_ino,DT_DIR) < 0) { goto out; @@ -743,7 +839,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) l = list_entry(i, yaffs_Object,siblings); yaffs_GetObjectName(l,name,YAFFS_MAX_NAME_LENGTH+1); - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readdir: %s inode %d\n",name,yaffs_GetObjectInode(l))); + T(YAFFS_TRACE_OS,("yaffs_readdir: %s inode %d\n",name,yaffs_GetObjectInode(l))); if(filldir(dirent, name, @@ -773,7 +869,8 @@ 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 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 static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev) @@ -790,12 +887,12 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r if(parent) { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: parent object %d type %d\n", + T(YAFFS_TRACE_OS,("yaffs_mknod: parent object %d type %d\n", parent->objectId,parent->variantType)); } else { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: could not get parent object\n")); + T(YAFFS_TRACE_OS,("yaffs_mknod: could not get parent object\n")); return -EPERM; } @@ -810,19 +907,23 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r { default: // Special (socket, fifo, device...) - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making special\n")); - obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,rdev); + T(YAFFS_TRACE_OS,("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)); +#else + obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,rdev); +#endif break; case S_IFREG: // file - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n")); + T(YAFFS_TRACE_OS,("yaffs_mknod: making file\n")); obj = yaffs_MknodFile(parent,dentry->d_name.name,mode,current->uid, current->gid); break; case S_IFDIR: // directory - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making directory\n")); + T(YAFFS_TRACE_OS,("yaffs_mknod: making directory\n")); obj = yaffs_MknodDirectory(parent,dentry->d_name.name,mode,current->uid, current->gid); break; case S_IFLNK: // symlink - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n")); + T(YAFFS_TRACE_OS,("yaffs_mknod: making file\n")); obj = NULL; // Do we ever get here? break; } @@ -831,12 +932,12 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r { inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj); d_instantiate(dentry, inode); - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod created object %d count = %d\n",obj->objectId,atomic_read(&inode->i_count))); + T(YAFFS_TRACE_OS,("yaffs_mknod created object %d count = %d\n",obj->objectId,atomic_read(&inode->i_count))); error = 0; } else { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod failed making object\n")); + T(YAFFS_TRACE_OS,("yaffs_mknod failed making object\n")); error = -ENOMEM; } @@ -848,7 +949,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r static int yaffs_mkdir(struct inode * dir, struct dentry * dentry, int mode) { int retVal; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mkdir\n")); + T(YAFFS_TRACE_OS,("yaffs_mkdir\n")); retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); #if 0 // attempt to fix dir bug - didn't work @@ -860,13 +961,14 @@ 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 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 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) #endif { - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_create\n")); + T(YAFFS_TRACE_OS,("yaffs_create\n")); return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); } @@ -878,7 +980,7 @@ static int yaffs_unlink(struct inode * dir, struct dentry *dentry) yaffs_Device *dev; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_unlink %d:%s\n",(int)(dir->i_ino),dentry->d_name.name)); + T(YAFFS_TRACE_OS,("yaffs_unlink %d:%s\n",(int)(dir->i_ino),dentry->d_name.name)); dev = yaffs_InodeToObject(dir)->myDev; @@ -913,7 +1015,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode * dir, struct dent yaffs_Object *link=NULL; yaffs_Device *dev; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_link\n")); + T(YAFFS_TRACE_OS,("yaffs_link\n")); obj = yaffs_InodeToObject(inode); dev = obj->myDev; @@ -931,7 +1033,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode * dir, struct dent old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj); d_instantiate(dentry, old_dentry->d_inode); atomic_inc(&old_dentry->d_inode->i_count); - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_link link count %d i_count %d\n", + T(YAFFS_TRACE_OS,("yaffs_link link count %d i_count %d\n", old_dentry->d_inode->i_nlink,atomic_read(&old_dentry->d_inode->i_count))); } @@ -955,7 +1057,7 @@ static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char * yaffs_Object *obj; yaffs_Device *dev; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_symlink\n")); + T(YAFFS_TRACE_OS,("yaffs_symlink\n")); dev = yaffs_InodeToObject(dir)->myDev; yaffs_GrossLock(dev); @@ -971,12 +1073,12 @@ static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char * inode = yaffs_get_inode(dir->i_sb, obj->st_mode, 0, obj); d_instantiate(dentry, inode); - T(YAFFS_TRACE_OS,(KERN_DEBUG"symlink created OK\n")); + T(YAFFS_TRACE_OS,("symlink created OK\n")); return 0; } else { - T(YAFFS_TRACE_OS,(KERN_DEBUG"symlink not created\n")); + T(YAFFS_TRACE_OS,("symlink not created\n")); } @@ -993,7 +1095,7 @@ static int yaffs_sync_object(struct file * file, struct dentry *dentry, int data dev = obj->myDev; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_sync_object\n")); + T(YAFFS_TRACE_OS,("yaffs_sync_object\n")); yaffs_GrossLock(dev); yaffs_FlushFile(obj,1); yaffs_GrossUnlock(dev); @@ -1062,7 +1164,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) int error; yaffs_Device *dev; - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_setattr of object %d\n",yaffs_InodeToObject(inode)->objectId)); + T(YAFFS_TRACE_OS,("yaffs_setattr of object %d\n",yaffs_InodeToObject(inode)->objectId)); if((error = inode_change_ok(inode,attr)) == 0) { @@ -1083,14 +1185,15 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) return error; } -#if defined(CONFIG_KERNEL_2_5) /* Added NCB 185-8-2003 */ +//#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 static int yaffs_statfs(struct super_block *sb, struct statfs *buf) #endif { yaffs_Device *dev = yaffs_SuperToDevice(sb); - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_statfs\n")); + T(YAFFS_TRACE_OS,("yaffs_statfs\n")); yaffs_GrossLock(dev); @@ -1117,7 +1220,7 @@ static void yaffs_read_inode (struct inode *inode) yaffs_Object *obj ; yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb); - T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_read_inode for %d\n",(int)inode->i_ino)); + T(YAFFS_TRACE_OS,("yaffs_read_inode for %d\n",(int)inode->i_ino)); obj = yaffs_FindObjectByNumber(dev,inode->i_ino); @@ -1180,13 +1283,13 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl sb->s_op = &yaffs_super_ops; if(!sb) - printk(KERN_INFO"yaffs: sb is NULL\n"); + T(YAFFS_TRACE_OS,("yaffs: sb is NULL\n")); else if(!sb->s_dev) - printk(KERN_INFO"yaffs: sb->s_dev is NULL\n"); + T(YAFFS_TRACE_OS,("yaffs: sb->s_dev is NULL\n")); else if(! kdevname(sb->s_dev)) - printk(KERN_INFO"yaffs: kdevname is NULL\n"); + T(YAFFS_TRACE_OS,("yaffs: kdevname is NULL\n")); else - printk(KERN_INFO"yaffs: dev is %d name is \"%s\"\n", sb->s_dev, kdevname(sb->s_dev)); + T(YAFFS_TRACE_OS,("yaffs: dev is %d name is \"%s\"\n", sb->s_dev, kdevname(sb->s_dev))); @@ -1215,7 +1318,7 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl if(!dev) { // Deep shit could not allocate device structure - printk(KERN_DEBUG"yaffs_read_super: Failed trying to allocate yaffs_Device. Terminating debug.\n"); + T(YAFFS_TRACE_OS,("yaffs_read_super: Failed trying to allocate yaffs_Device. Terminating debug.\n")); return NULL; } @@ -1228,6 +1331,7 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK; dev->nBytesPerChunk = YAFFS_BYTES_PER_CHUNK; dev->nReservedBlocks = 5; + dev->nShortOpCaches = 10; // Enable short op caching dev->writeChunkToNAND = nandemul_WriteChunkToNAND; dev->readChunkFromNAND = nandemul_ReadChunkFromNAND; @@ -1244,30 +1348,37 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl #ifdef CONFIG_YAFFS_MTD_ENABLED struct mtd_info *mtd; - printk(KERN_DEBUG "yaffs: Attempting MTD mount on %u.%u, \"%s\"\n", - MAJOR(sb->s_dev),MINOR(sb->s_dev),kdevname(sb->s_dev)); + 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))); - // Hope it's a NAND mtd + // Check it's an mtd device..... + if(MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) + { + return NULL; // This isn't an mtd device + } + + // Get the device mtd = get_mtd_device(NULL, MINOR(sb->s_dev)); if (!mtd) { - printk(KERN_DEBUG "yaffs: MTD device #%u doesn't appear to exist\n", MINOR(sb->s_dev)); + T(YAFFS_TRACE_ALWAYS,( "yaffs: MTD device #%u doesn't appear to exist\n", MINOR(sb->s_dev))); return NULL; } + // Check it's NAND if(mtd->type != MTD_NANDFLASH) { - printk(KERN_DEBUG "yaffs: MTD device is not NAND it's type %d\n", mtd->type); + T(YAFFS_TRACE_ALWAYS,( "yaffs: MTD device is not NAND it's type %d\n", mtd->type)); return NULL; } - //printk(KERN_DEBUG" erase %x\n",mtd->erase); - //printk(KERN_DEBUG" read %x\n",mtd->read); - //printk(KERN_DEBUG" write %x\n",mtd->write); - //printk(KERN_DEBUG" readoob %x\n",mtd->read_oob); - //printk(KERN_DEBUG" writeoob %x\n",mtd->write_oob); - //printk(KERN_DEBUG" oobblock %x\n",mtd->oobblock); - //printk(KERN_DEBUG" oobsize %x\n",mtd->oobsize); + //T(YAFFS_TRACE_OS,(KERN_DEBUG" erase %x\n",mtd->erase); + //T(YAFFS_TRACE_OS,(KERN_DEBUG" read %x\n",mtd->read); + //T(YAFFS_TRACE_OS,(KERN_DEBUG" write %x\n",mtd->write); + //T(YAFFS_TRACE_OS,(KERN_DEBUG" readoob %x\n",mtd->read_oob); + //T(YAFFS_TRACE_OS,(KERN_DEBUG" writeoob %x\n",mtd->write_oob); + //T(YAFFS_TRACE_OS,(KERN_DEBUG" oobblock %x\n",mtd->oobblock); + //T(YAFFS_TRACE_OS,(KERN_DEBUG" oobsize %x\n",mtd->oobsize); if(!mtd->erase || @@ -1280,14 +1391,14 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl !mtd->read_oob || !mtd->write_oob ) { - printk(KERN_DEBUG "yaffs: MTD device does not support required functions\n"); + T(YAFFS_TRACE_ALWAYS,( "yaffs: MTD device does not support required functions\n")); return NULL; } if(mtd->oobblock != YAFFS_BYTES_PER_CHUNK || mtd->oobsize != YAFFS_BYTES_PER_SPARE) { - printk(KERN_DEBUG "yaffs: MTD device does not support have the right page sizes\n"); + T(YAFFS_TRACE_ALWAYS,( "yaffs: MTD device does not support have the right page sizes\n")); return NULL; } @@ -1296,7 +1407,8 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl // like it has the right capabilities // Set the yaffs_Device up for ram emulation -#if defined(CONFIG_KERNEL_2_5) +//#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 sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL); @@ -1304,7 +1416,7 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl if(!dev) { // Deep shit could not allocate device structure - printk(KERN_DEBUG"yaffs_read_super: Failed trying to allocate yaffs_Device. Terminating debug.\n"); + T(YAFFS_TRACE_ALWAYS,("yaffs_read_super: Failed trying to allocate yaffs_Device. Terminating debug.\n")); return NULL; } @@ -1387,7 +1499,8 @@ static int yaffs_internal_read_super_mtd(struct super_block * sb, void * data, i #ifdef CONFIG_YAFFS_MTD_ENABLED -#if defined(CONFIG_KERNEL_2_5) +//#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) { @@ -1400,8 +1513,8 @@ 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, + .kill_sb = kill_block_super, +// .kill_sb = kill_litter_super, .fs_flags = FS_REQUIRES_DEV, }; #else @@ -1416,7 +1529,8 @@ static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV) #ifdef CONFIG_YAFFS_RAM_ENABLED -#if defined(CONFIG_KERNEL_2_5) +//#if defined(CONFIG_KERNEL_2_5) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) static struct super_block *yaffs_ram_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data) { @@ -1429,8 +1543,8 @@ static struct file_system_type yaffs_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_block_super, +// .kill_sb = kill_litter_super, .fs_flags = FS_SINGLE, }; #else @@ -1477,6 +1591,7 @@ static char * yaffs_dump_dev(char *buf,yaffs_Device *dev,char *name) buf +=sprintf(buf,"nUnlinkedFiles..... %d\n",dev->nUnlinkedFiles); buf +=sprintf(buf,"nBackgroudDeletions %d\n",dev->nBackgroundDeletions); buf +=sprintf(buf,"useNANDECC......... %d\n",dev->useNANDECC); + buf +=sprintf(buf,"nShortOpCaches..... %d\n",dev->nShortOpCaches); return buf; @@ -1520,7 +1635,7 @@ static int yaffs_proc_ram_write( ) { - printk(KERN_DEBUG "yaffs write size %d\n",count); + T(YAFFS_TRACE_OS,( "yaffs write size %d\n",count)); return count; } @@ -1530,11 +1645,11 @@ static int __init init_yaffs_fs(void) yaffs_dev = yaffsram_dev = NULL; - printk(KERN_DEBUG "yaffs " __DATE__ " " __TIME__ " Initialisation\n"); + T(YAFFS_TRACE_OS,( "yaffs " __DATE__ " " __TIME__ " Initialisation\n")); #ifdef CONFIG_YAFFS_USE_GENERIC_RW - printk(KERN_DEBUG "yaffs is using generic read/write (caching)\n"); + T(YAFFS_TRACE_OS,( "yaffs is using generic read/write (caching)\n")); #else - printk(KERN_DEBUG "yaffs is using direct read/write (uncached)\n"); + T(YAFFS_TRACE_OS,( "yaffs is using direct read/write (uncached)\n")); #endif @@ -1587,7 +1702,7 @@ static int __init init_yaffs_fs(void) static void __exit exit_yaffs_fs(void) { - printk(KERN_DEBUG "yaffs " __DATE__ " " __TIME__ " Clean up\n"); + T(YAFFS_TRACE_OS,( "yaffs " __DATE__ " " __TIME__ " Clean up\n")); remove_proc_entry("yaffs",&proc_root); @@ -1607,3 +1722,4 @@ MODULE_DESCRIPTION("YAFFS - a NAND specific flash file system"); MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002"); MODULE_LICENSE("GPL"); +