X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs%2F.git;a=blobdiff_plain;f=yaffs_fs.c;h=de7ee00f00b2d869c9f80a00187ca4acdb73c150;hp=9be8428cad8cff648e75494dea064f36ff75a0e1;hb=4ea0578f8af411adf56fdc1eb4af08f4e36c7eec;hpb=0c0639ff1c8a2d8fe5b03ad0284bb400ec78e7cb diff --git a/yaffs_fs.c b/yaffs_fs.c index 9be8428..de7ee00 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -27,9 +27,10 @@ */ -const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.17 2002-10-02 02:11:25 charles Exp $"; +const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.23 2003-01-17 04:19:08 charles Exp $"; extern const char *yaffs_guts_c_version; + #include #include #include @@ -47,8 +48,14 @@ extern const char *yaffs_guts_c_version; #include +#include "yportenv.h" #include "yaffs_guts.h" + + + +unsigned yaffs_traceMask = YAFFS_TRACE_ALWAYS | YAFFS_TRACE_BAD_BLOCKS; + #ifdef CONFIG_YAFFS_RAM_ENABLED #include "yaffs_nandemul.h" // 2 MB of RAM for emulation @@ -60,7 +67,7 @@ extern const char *yaffs_guts_c_version; #include "yaffs_mtdif.h" #endif //CONFIG_YAFFS_MTD_ENABLED -#define T(x) printk x +//#define T(x) printk x @@ -175,14 +182,14 @@ static struct super_operations yaffs_super_ops = { static void yaffs_GrossLock(yaffs_Device *dev) { - T((KERN_DEBUG"yaffs locking\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs locking\n")); down(&dev->grossLock); } static void yaffs_GrossUnlock(yaffs_Device *dev) { - T((KERN_DEBUG"yaffs unlocking\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs unlocking\n")); up(&dev->grossLock); } @@ -247,7 +254,7 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry) yaffs_GrossLock(dev); - T((KERN_DEBUG"yaffs_lookup for %d:%s\n",yaffs_InodeToObject(dir)->objectId,dentry->d_name.name)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup for %d:%s\n",yaffs_InodeToObject(dir)->objectId,dentry->d_name.name)); obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),dentry->d_name.name); @@ -257,13 +264,13 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry) if(obj) { - T((KERN_DEBUG"yaffs_lookup found %d\n",obj->objectId)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup found %d\n",obj->objectId)); inode = yaffs_get_inode(dir->i_sb, obj->st_mode,0,obj); if(inode) { - T((KERN_DEBUG"yaffs_loookup dentry \n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_loookup dentry \n")); //dget(dentry); // try to solve directory bug d_add(dentry,inode); @@ -276,7 +283,7 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry) } else { - T((KERN_DEBUG"yaffs_lookup not found\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup not found\n")); } yaffs_GrossUnlock(dev); @@ -290,7 +297,7 @@ 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_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\n",(int)inode->i_ino, atomic_read(&inode->i_count))); } @@ -299,7 +306,7 @@ static void yaffs_clear_inode(struct inode *inode) { yaffs_Object *obj = yaffs_InodeToObject(inode); - T(("yaffs_clear_inode: ino %d, count %d %s\n",(int)inode->i_ino, atomic_read(&inode->i_count), + 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) @@ -320,7 +327,7 @@ static void yaffs_delete_inode(struct inode *inode) yaffs_Object *obj = yaffs_InodeToObject(inode); yaffs_Device *dev; - T(("yaffs_delete_inode: ino %d, count %d %s\n",(int)inode->i_ino, atomic_read(&inode->i_count), + T(YAFFS_TRACE_OS,("yaffs_delete_inode: ino %d, count %d %s\n",(int)inode->i_ino, atomic_read(&inode->i_count), obj ? "object exists" : "null object")); if(obj) @@ -340,12 +347,12 @@ static int yaffs_file_flush(struct file* file) yaffs_Device *dev = obj->myDev; - T((KERN_DEBUG"yaffs_file_flush object %d (%s)\n",obj->objectId, + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_flush object %d (%s)\n",obj->objectId, obj->dirty ? "dirty" : "clean")); yaffs_GrossLock(dev); - yaffs_FlushFile(obj); + yaffs_FlushFile(obj,1); yaffs_GrossUnlock(dev); @@ -364,7 +371,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg) yaffs_Device *dev; - T((KERN_DEBUG"yaffs_readpage at %08x, size %08x\n", + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readpage at %08x, size %08x\n", (unsigned)(pg->index << PAGE_CACHE_SHIFT), (unsigned)PAGE_CACHE_SIZE)); obj = yaffs_DentryToObject(f->f_dentry); @@ -398,7 +405,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg) kunmap(pg); - T((KERN_DEBUG"yaffs_readpage done\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readpage done\n")); return ret; } @@ -418,7 +425,7 @@ static int yaffs_readpage(struct file *f, struct page * pg) static int yaffs_prepare_write(struct file *f, struct page *pg, unsigned offset, unsigned to) { - T((KERN_DEBUG"yaffs_prepair_write\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_prepair_write\n")); if(!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE)) return yaffs_readpage_nolock(f,pg); @@ -437,13 +444,13 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, unsigned spos = pos; unsigned saddr = (unsigned)addr; - T((KERN_DEBUG"yaffs_commit_write addr %x pos %x nBytes %d\n",saddr,spos,nBytes)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"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((KERN_DEBUG"yaffs_commit_write not same size nWritten %d nBytes %d\n",nWritten,nBytes)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_commit_write not same size nWritten %d nBytes %d\n",nWritten,nBytes)); SetPageError(pg); ClearPageUptodate(pg); } @@ -452,7 +459,7 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, SetPageUptodate(pg); } - T((KERN_DEBUG"yaffs_commit_write returning %d\n",nWritten)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_commit_write returning %d\n",nWritten)); return nWritten; @@ -477,7 +484,7 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) inode->i_size = yaffs_GetObjectFileLength(obj); inode->i_nlink = yaffs_GetObjectLinkCount(obj); - T((KERN_DEBUG"yaffs_FillInode mode %x uid %d gid %d size %d count %d\n", + T(YAFFS_TRACE_OS,(KERN_DEBUG"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) @@ -506,7 +513,7 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) } else { - T((KERN_DEBUG"yaffs_FileInode invalid parameters\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_FileInode invalid parameters\n")); } } @@ -515,7 +522,7 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,yaffs_Ob { struct inode * inode; - T((KERN_DEBUG"yaffs_get_inode for object %d\n",obj->objectId)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_get_inode for object %d\n",obj->objectId)); inode = iget(sb,obj->objectId); @@ -532,7 +539,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((KERN_DEBUG"yaffs_file_read\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read\n")); obj = yaffs_DentryToObject(f->f_dentry); @@ -564,7 +571,7 @@ static ssize_t yaffs_file_read(struct file *f, char *buf, size_t n, loff_t *pos) ipos = *pos; - T((KERN_DEBUG"yaffs_file_read read %d bytes, %d read at %d\n",n,nRead,ipos)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read read %d bytes, %d read at %d\n",n,nRead,ipos)); return nRead; } @@ -598,16 +605,16 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_ if(!obj) { - T((KERN_DEBUG"yaffs_file_write: hey obj is null!\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write: hey obj is null!\n")); } else { - T((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,(KERN_DEBUG"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((KERN_DEBUG"yaffs_file_write writing %d bytes, %d written at %d\n",n,nWritten,ipos)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write writing %d bytes, %d written at %d\n",n,nWritten,ipos)); if(nWritten > 0) { ipos += nWritten; @@ -617,7 +624,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_ inode->i_size = ipos; inode->i_blocks = (ipos + inode->i_blksize - 1)/ inode->i_blksize; - T((KERN_DEBUG"yaffs_file_write size updated to %d bytes, %d blocks\n",ipos,(int)(inode->i_blocks))); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write size updated to %d bytes, %d blocks\n",ipos,(int)(inode->i_blocks))); } } @@ -645,11 +652,11 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) offset = f->f_pos; - T(("yaffs_readdir: starting at %d\n",(int)offset)); + T(YAFFS_TRACE_OS,("yaffs_readdir: starting at %d\n",(int)offset)); if(offset == 0) { - T((KERN_DEBUG"yaffs_readdir: entry . ino %d \n",(int)inode->i_ino)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readdir: entry . ino %d \n",(int)inode->i_ino)); if(filldir(dirent,".",1,offset,inode->i_ino,DT_DIR) < 0) { goto out; @@ -659,7 +666,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) } if(offset == 1) { - T((KERN_DEBUG"yaffs_readdir: entry .. ino %d \n",(int)f->f_dentry->d_parent->d_inode->i_ino)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"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; @@ -678,7 +685,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((KERN_DEBUG"yaffs_readdir: %s inode %d\n",name,yaffs_GetObjectInode(l))); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readdir: %s inode %d\n",name,yaffs_GetObjectInode(l))); if(filldir(dirent, name, @@ -721,16 +728,16 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r if(parent) { - T((KERN_DEBUG"yaffs_mknod: parent object %d type %d\n", + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: parent object %d type %d\n", parent->objectId,parent->variantType)); } else { - T((KERN_DEBUG"yaffs_mknod: could not get parent object\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: could not get parent object\n")); return -EPERM; } - T(("yaffs_mknod: making oject for %s, mode %x dev %x\n", + T(YAFFS_TRACE_OS,("yaffs_mknod: making oject for %s, mode %x dev %x\n", dentry->d_name.name, mode,rdev)); dev = parent->myDev; @@ -741,19 +748,19 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r { default: // Special (socket, fifo, device...) - T((KERN_DEBUG"yaffs_mknod: making special\n")); + 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); break; case S_IFREG: // file - T((KERN_DEBUG"yaffs_mknod: making file\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n")); obj = yaffs_MknodFile(parent,dentry->d_name.name,mode,current->uid, current->gid); break; case S_IFDIR: // directory - T((KERN_DEBUG"yaffs_mknod: making directory\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making directory\n")); obj = yaffs_MknodDirectory(parent,dentry->d_name.name,mode,current->uid, current->gid); break; case S_IFLNK: // symlink - T((KERN_DEBUG"yaffs_mknod: making file\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n")); obj = NULL; // Do we ever get here? break; } @@ -762,12 +769,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((KERN_DEBUG"yaffs_mknod created object %d count = %d\n",obj->objectId,atomic_read(&inode->i_count))); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod created object %d count = %d\n",obj->objectId,atomic_read(&inode->i_count))); error = 0; } else { - T((KERN_DEBUG"yaffs_mknod failed making object\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod failed making object\n")); error = -ENOMEM; } @@ -779,7 +786,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((KERN_DEBUG"yaffs_mkdir\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mkdir\n")); retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); #if 0 // attempt to fix dir bug - didn't work @@ -793,7 +800,7 @@ static int yaffs_mkdir(struct inode * dir, struct dentry * dentry, int mode) static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) { - T((KERN_DEBUG"yaffs_create\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_create\n")); return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); } @@ -801,12 +808,11 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) static int yaffs_unlink(struct inode * dir, struct dentry *dentry) { int retVal; - int nlinks; yaffs_Device *dev; - T((KERN_DEBUG"yaffs_unlink %d:%s\n",(int)(dir->i_ino),dentry->d_name.name)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_unlink %d:%s\n",(int)(dir->i_ino),dentry->d_name.name)); dev = yaffs_InodeToObject(dir)->myDev; @@ -821,6 +827,7 @@ static int yaffs_unlink(struct inode * dir, struct dentry *dentry) if( retVal == YAFFS_OK) { dentry->d_inode->i_nlink--; + mark_inode_dirty(dentry->d_inode); return 0; } else @@ -840,14 +847,17 @@ static int yaffs_link(struct dentry *old_dentry, struct inode * dir, struct dent yaffs_Object *link=NULL; yaffs_Device *dev; - T((KERN_DEBUG"yaffs_link\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_link\n")); obj = yaffs_InodeToObject(inode); dev = obj->myDev; yaffs_GrossLock(dev); - - link = yaffs_Link(yaffs_InodeToObject(dir),dentry->d_name.name,obj); + + if (!S_ISDIR(inode->i_mode)) // Don't link directories + { + link = yaffs_Link(yaffs_InodeToObject(dir),dentry->d_name.name,obj); + } if(link) @@ -855,7 +865,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((KERN_DEBUG"yaffs_link link count %d i_count %d\n", + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_link link count %d i_count %d\n", old_dentry->d_inode->i_nlink,atomic_read(&old_dentry->d_inode->i_count))); } @@ -879,7 +889,7 @@ static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char * yaffs_Object *obj; yaffs_Device *dev; - T((KERN_DEBUG"yaffs_symlink\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_symlink\n")); dev = yaffs_InodeToObject(dir)->myDev; yaffs_GrossLock(dev); @@ -890,12 +900,17 @@ static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char * if(obj) { - T((KERN_DEBUG"symlink created OK\n")); + + struct inode* inode; + + 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")); return 0; } else { - T((KERN_DEBUG"symlink not created\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"symlink not created\n")); } @@ -912,9 +927,9 @@ static int yaffs_sync_object(struct file * file, struct dentry *dentry, int data dev = obj->myDev; - T((KERN_DEBUG"yaffs_sync_object\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_sync_object\n")); yaffs_GrossLock(dev); - yaffs_FlushFile(obj); + yaffs_FlushFile(obj,1); yaffs_GrossUnlock(dev); return 0; } @@ -927,22 +942,44 @@ static int yaffs_sync_object(struct file * file, struct dentry *dentry, int data static int yaffs_rename(struct inode * old_dir, struct dentry *old_dentry, struct inode * new_dir,struct dentry *new_dentry) { yaffs_Device *dev; - int retVal; + int retVal = YAFFS_FAIL; + int removed = 0; + yaffs_Object *target; dev = yaffs_InodeToObject(old_dir)->myDev; yaffs_GrossLock(dev); - // Unlink the target if it exists - yaffs_Unlink(yaffs_InodeToObject(new_dir),new_dentry->d_name.name); + // Check if the target is an existing directory that is not empty. + target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),new_dentry->d_name.name); + + if(target && + target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY && + !list_empty(&target->variant.directoryVariant.children)) + { + retVal = YAFFS_FAIL; + } + else + { + + // Unlink the target if it exists + removed = yaffs_Unlink(yaffs_InodeToObject(new_dir),new_dentry->d_name.name); - retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),old_dentry->d_name.name, - yaffs_InodeToObject(new_dir),new_dentry->d_name.name); + retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),old_dentry->d_name.name, + yaffs_InodeToObject(new_dir),new_dentry->d_name.name); + + } yaffs_GrossUnlock(dev); if(retVal == YAFFS_OK) { + if(removed == YAFFS_OK) + { + new_dentry->d_inode->i_nlink--; + mark_inode_dirty(new_dentry->d_inode); + } + return 0; } else @@ -959,7 +996,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) int error; yaffs_Device *dev; - T((KERN_DEBUG"yaffs_setattr of object %d\n",yaffs_InodeToObject(inode)->objectId)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_setattr of object %d\n",yaffs_InodeToObject(inode)->objectId)); if((error = inode_change_ok(inode,attr)) == 0) { @@ -983,7 +1020,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) static int yaffs_statfs(struct super_block *sb, struct statfs *buf) { yaffs_Device *dev = yaffs_SuperToDevice(sb); - T((KERN_DEBUG"yaffs_statfs\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_statfs\n")); yaffs_GrossLock(dev); @@ -1010,7 +1047,7 @@ static void yaffs_read_inode (struct inode *inode) yaffs_Object *obj ; yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb); - T((KERN_DEBUG"yaffs_read_inode for %d\n",(int)inode->i_ino)); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_read_inode for %d\n",(int)inode->i_ino)); obj = yaffs_FindObjectByNumber(dev,inode->i_ino); @@ -1090,10 +1127,10 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; #endif - T(("yaffs_read_super: %s block size %d\n", useRam ? "RAM" : "MTD",(int)(sb->s_blocksize))); + T(YAFFS_TRACE_OS,("yaffs_read_super: %s block size %d\n", useRam ? "RAM" : "MTD",(int)(sb->s_blocksize))); #ifdef CONFIG_YAFFS_DISABLE_WRITE_VERIFY - T(("yaffs: Write verification disabled. All guarantees null and void\n"); + T(YAFFS_TRACE_OS,("yaffs: Write verification disabled. All guarantees null and void\n"); #endif @@ -1118,6 +1155,8 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl nBlocks = YAFFS_RAM_EMULATION_SIZE / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK); dev->startBlock = 1; // Don't use block 0 dev->endBlock = nBlocks - 1; + dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK; + dev->nBytesPerChunk = YAFFS_BYTES_PER_CHUNK; dev->writeChunkToNAND = nandemul_WriteChunkToNAND; dev->readChunkFromNAND = nandemul_ReadChunkFromNAND; @@ -1163,8 +1202,12 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl 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) + !mtd->write_oob ) { printk(KERN_DEBUG "yaffs: MTD device does not support required functions\n"); return NULL; @@ -1198,6 +1241,9 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK); dev->startBlock = 1; // Don't use block 0 dev->endBlock = nBlocks - 1; + dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK; + dev->nBytesPerChunk = YAFFS_BYTES_PER_CHUNK; + // ... and the functions. dev->writeChunkToNAND = nandmtd_WriteChunkToNAND; @@ -1206,6 +1252,10 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl dev->initialiseNAND = nandmtd_InitialiseNAND; dev->putSuperFunc = yaffs_MTDPutSuper; + +#ifdef CONFIG_YAFFS_USE_NANDECC + dev->useNANDECC = 1; +#endif yaffs_dev = dev; @@ -1218,7 +1268,7 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl yaffs_GrossLock(dev); yaffs_GutsInitialise(yaffs_SuperToDevice(sb)); - T(("yaffs_read_super: guts initialised\n")); + T(YAFFS_TRACE_OS,("yaffs_read_super: guts initialised\n")); // Create root inode inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0,yaffs_Root(yaffs_SuperToDevice(sb))); @@ -1228,12 +1278,12 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl if (!inode) return NULL; - T(("yaffs_read_super: got root inode\n")); + T(YAFFS_TRACE_OS,("yaffs_read_super: got root inode\n")); root = d_alloc_root(inode); - T(("yaffs_read_super: d_alloc_root done\n")); + T(YAFFS_TRACE_OS,("yaffs_read_super: d_alloc_root done\n")); if (!root) { iput(inode); @@ -1241,7 +1291,7 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl } sb->s_root = root; - T(("yaffs_read_super: done\n")); + T(YAFFS_TRACE_OS,("yaffs_read_super: done\n")); return sb; } @@ -1286,6 +1336,7 @@ static char * yaffs_dump_dev(char *buf,yaffs_Device *dev,char *name) buf +=sprintf(buf,"nBlockErasures..... %d\n",dev->nBlockErasures); buf +=sprintf(buf,"nGCCopies.......... %d\n",dev->nGCCopies); buf +=sprintf(buf,"garbageCollections. %d\n",dev->garbageCollections); + buf +=sprintf(buf,"passiveGCs......... %d\n",dev->passiveGarbageCollections); buf +=sprintf(buf,"nRetriedWrites..... %d\n",dev->nRetriedWrites); buf +=sprintf(buf,"nRetireBlocks...... %d\n",dev->nRetiredBlocks); buf +=sprintf(buf,"eccFixed........... %d\n",dev->eccFixed); @@ -1296,6 +1347,8 @@ static char * yaffs_dump_dev(char *buf,yaffs_Device *dev,char *name) buf +=sprintf(buf,"nDeletedFiles...... %d\n",dev->nDeletedFiles); buf +=sprintf(buf,"nUnlinkedFiles..... %d\n",dev->nUnlinkedFiles); buf +=sprintf(buf,"nBackgroudDeletions %d\n",dev->nBackgroundDeletions); + buf +=sprintf(buf,"useNANDECC......... %d\n",dev->useNANDECC); + return buf; }