*/
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.18 2002-11-08 07:19:41 charles Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.25 2003-03-11 05:16:53 charles Exp $";
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
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);
}
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);
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);
}
else
{
- T((KERN_DEBUG"yaffs_lookup not found\n"));
+ T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup not found\n"));
}
yaffs_GrossUnlock(dev);
// 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)));
}
{
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)
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)
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);
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);
kunmap(pg);
- T((KERN_DEBUG"yaffs_readpage done\n"));
+ T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readpage done\n"));
return ret;
}
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);
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);
}
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;
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)
}
else
{
- T((KERN_DEBUG"yaffs_FileInode invalid parameters\n"));
+ T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_FileInode invalid parameters\n"));
}
}
{
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);
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);
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;
}
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;
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)));
}
}
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;
}
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;
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,
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;
{
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;
}
{
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;
}
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
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);
}
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;
if( retVal == YAFFS_OK)
{
dentry->d_inode->i_nlink--;
+ mark_inode_dirty(dentry->d_inode);
return 0;
}
else
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)
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)));
}
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);
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"));
}
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;
}
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
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)
{
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);
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);
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
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->nReservedBlocks = 5;
dev->writeChunkToNAND = nandemul_WriteChunkToNAND;
dev->readChunkFromNAND = nandemul_ReadChunkFromNAND;
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;
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;
+ dev->nReservedBlocks = 5;
+
// ... and the functions.
dev->writeChunkToNAND = nandmtd_WriteChunkToNAND;
dev->initialiseNAND = nandmtd_InitialiseNAND;
dev->putSuperFunc = yaffs_MTDPutSuper;
+
+#ifdef CONFIG_YAFFS_USE_NANDECC
+ dev->useNANDECC = 1;
+#endif
yaffs_dev = dev;
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)));
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);
}
sb->s_root = root;
- T(("yaffs_read_super: done\n"));
+ T(YAFFS_TRACE_OS,("yaffs_read_super: done\n"));
return sb;
}
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);
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;
}