From: charles Date: Thu, 6 Jan 2005 23:28:34 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs%2F.git;a=commitdiff_plain;h=7b5f93e758d963355b31ce0a1f0eafa16074f35d *** empty log message *** --- diff --git a/yaffs_fs.c b/yaffs_fs.c index 0486c14..a00ef1b 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -29,7 +29,7 @@ */ -const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.36 2004-12-23 18:06:45 charles Exp $"; +const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.37 2005-01-06 23:28:34 charles Exp $"; extern const char *yaffs_guts_c_version; @@ -235,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); } @@ -313,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); @@ -323,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 @@ -345,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); @@ -362,7 +362,8 @@ 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)); } @@ -426,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); @@ -450,7 +451,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg) 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); @@ -484,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; } @@ -561,7 +562,7 @@ static int yaffs_writepage(struct page *page) 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); @@ -580,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); } @@ -595,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; @@ -633,7 +634,7 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj) 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) @@ -662,7 +663,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")); } } @@ -671,7 +672,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); @@ -688,7 +689,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); @@ -720,7 +721,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; } @@ -754,16 +755,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; @@ -773,7 +774,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 + 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))); } } @@ -805,7 +806,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; @@ -815,7 +816,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; @@ -834,7 +835,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, @@ -882,12 +883,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; } @@ -902,19 +903,19 @@ 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")); + T(YAFFS_TRACE_OS,("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(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; } @@ -923,12 +924,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; } @@ -940,7 +941,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 @@ -959,7 +960,7 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, stru 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); } @@ -971,7 +972,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; @@ -1006,7 +1007,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; @@ -1024,7 +1025,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))); } @@ -1048,7 +1049,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); @@ -1064,12 +1065,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")); } @@ -1086,7 +1087,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); @@ -1155,7 +1156,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) { @@ -1184,7 +1185,7 @@ 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); @@ -1211,7 +1212,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); @@ -1274,13 +1275,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))); @@ -1309,7 +1310,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; } @@ -1338,8 +1339,8 @@ 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))); // Check it's an mtd device..... if(MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) @@ -1351,24 +1352,24 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl 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 || @@ -1381,14 +1382,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; } @@ -1406,7 +1407,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; } @@ -1624,7 +1625,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; } @@ -1634,11 +1635,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 @@ -1691,7 +1692,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); diff --git a/yaffs_guts.c b/yaffs_guts.c index 7c97b31..d8cdcb7 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -14,7 +14,7 @@ */ //yaffs_guts.c -const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.37 2004-10-20 20:12:43 charles Exp $"; +const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.38 2005-01-06 23:28:34 charles Exp $"; #include "yportenv.h" @@ -1623,6 +1623,11 @@ yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev,__u32 number) in = list_entry(i, yaffs_Object,hashLink); if(in->objectId == number) { +#ifdef __KERNEL__ + // Don't tell the VFS about this if it has been marked for freeing + if(in->deferedFree) + return NULL; +#endif return in; } } @@ -3136,7 +3141,7 @@ static void yaffs_FlushFilesChunkCache(yaffs_Object *obj) int lowest; int i; yaffs_ChunkCache *cache; - int chunkWritten; + int chunkWritten = 0; int nBytes; int nCaches = obj->myDev->nShortOpCaches; @@ -3765,6 +3770,7 @@ static int yaffs_DoGenericObjectDeletion(yaffs_Object *in) yaffs_RemoveObjectFromDirectory(in); yaffs_DeleteChunk(in->myDev,in->chunkId,1); + in->chunkId = -1; #if 0 #ifdef __KERNEL__ if(in->myInode)