X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs%2F.git;a=blobdiff_plain;f=yaffs_fs.c;h=418f378bf2487a69abac6037c52e419e83a4891d;hp=8ef7da78edb5a84cc0f82adad3057136727edecc;hb=1ac8445c7e2f516db4a03a9d0715199279f9f134;hpb=f40b8435a109889e57bc37743ac7eb6badf1dd95 diff --git a/yaffs_fs.c b/yaffs_fs.c index 8ef7da7..418f378 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -22,10 +22,16 @@ * Acknowledgements: * * Luc van OostenRyck for numerous patches. * * Nick Bane for numerous patches. + * * Nick Bane for 2.5/2.6 integration. + * * Andras Toth for mknod rdev issue. * * Some code bodily lifted from JFFS2. */ +const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.30 2003-09-20 01:13:48 charles Exp $"; +extern const char *yaffs_guts_c_version; + + #include #include #include @@ -39,12 +45,29 @@ #include #include #include + + +#if defined(CONFIG_KERNEL_2_5) +#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)) +#else #include +#endif + #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 @@ -56,14 +79,19 @@ #include "yaffs_mtdif.h" #endif //CONFIG_YAFFS_MTD_ENABLED -#define T(x) printk x +//#define T(x) printk x #define yaffs_InodeToObject(iptr) ((yaffs_Object *)((iptr)->u.generic_ip)) #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode) -#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->u.generic_sbp) +//NCB #define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->u.generic_sbp) +#if defined(CONFIG_KERNEL_2_5) +#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->s_fs_info) +#else +#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->u.generic_sbp) +#endif static void yaffs_put_super(struct super_block *sb); @@ -76,19 +104,39 @@ 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 */ +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 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode); static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry); +#endif static int yaffs_link(struct dentry *old_dentry, struct inode * dir, struct dentry * dentry); 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) +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); +#endif 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 */ +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) +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 *); @@ -171,14 +219,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); } @@ -232,10 +280,14 @@ 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 */ +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) +#endif { yaffs_Object *obj; - struct inode *inode; + struct inode *inode = NULL; // NCB 2.5/2.6 needs NULL here yaffs_Device *dev = yaffs_InodeToObject(dir)->myDev; @@ -243,7 +295,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); @@ -253,13 +305,15 @@ 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")); +/* #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 d_add(dentry,inode); @@ -267,15 +321,19 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry) // return dentry; return NULL; +#endif } } else { - T((KERN_DEBUG"yaffs_lookup not found\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup not found\n")); } yaffs_GrossUnlock(dev); + +/* added NCB for 2.5/6 compatability - forces add even if inode is NULL which creates dentry hash*/ + d_add(dentry,inode); return NULL; // return (ERR_PTR(-EIO)); @@ -286,7 +344,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))); } @@ -295,7 +353,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) @@ -316,7 +374,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) @@ -336,12 +394,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); @@ -360,8 +418,8 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg) yaffs_Device *dev; - T((KERN_DEBUG"yaffs_readpage at %08x, size %08x\n", - pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE)); + 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); @@ -394,7 +452,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; } @@ -414,7 +472,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); @@ -431,15 +489,15 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, int nWritten; unsigned spos = pos; - unsigned saddr = addr; + 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); } @@ -448,7 +506,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; @@ -465,21 +523,32 @@ 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; - inode->i_blocks = 0; - inode->i_rdev = obj->st_rdev;; +#if defined(CONFIG_KERNEL_2_5) + inode->i_rdev = to_kdev_t(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; + inode->i_mtime.tv_nsec =0; + inode->i_ctime.tv_sec = (time_t)obj->st_ctime; + inode->i_ctime.tv_nsec = 0; +#else + inode->i_rdev = obj->st_rdev; inode->i_atime = obj->st_atime; inode->i_mtime = obj->st_mtime; inode->i_ctime = obj->st_ctime; +#endif inode->i_size = yaffs_GetObjectFileLength(obj); + inode->i_blocks = (inode->i_size + 511) >> 9; + 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) { default: // fifo, device or socket - init_special_inode(inode, obj->st_mode, obj->st_rdev); + init_special_inode(inode, obj->st_mode,(dev_t)(obj->st_rdev)); break; case S_IFREG: // file inode->i_op = &yaffs_file_inode_operations; @@ -502,7 +571,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")); } } @@ -511,7 +580,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); @@ -528,7 +597,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); @@ -560,7 +629,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; } @@ -594,16 +663,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; @@ -611,9 +680,9 @@ 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((KERN_DEBUG"yaffs_file_write size updated to %d bytes, %d blocks\n",ipos,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))); } } @@ -641,11 +710,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; @@ -655,7 +724,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; @@ -674,7 +743,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, @@ -704,7 +773,11 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) /* * File creation. Allocate an inode, and we're done.. */ -static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev) +#if defined(CONFIG_KERNEL_2_5) +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) +#endif { struct inode *inode; @@ -717,17 +790,17 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int d 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", - dentry->d_name.name, mode,dev)); + T(YAFFS_TRACE_OS,("yaffs_mknod: making oject for %s, mode %x dev %x\n", + dentry->d_name.name, mode,rdev)); dev = parent->myDev; @@ -737,33 +810,33 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int d { default: // Special (socket, fifo, device...) - T((KERN_DEBUG"yaffs_mknod: making special\n")); - obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,dev); + 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; } if(obj) { - inode = yaffs_get_inode(dir->i_sb, mode, dev, obj); + 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; } @@ -775,7 +848,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int d 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 @@ -787,9 +860,13 @@ 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 */ +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((KERN_DEBUG"yaffs_create\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_create\n")); return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); } @@ -797,18 +874,16 @@ 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",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; yaffs_GrossLock(dev); - nlinks = retVal = yaffs_Unlink(yaffs_InodeToObject(dir),dentry->d_name.name); @@ -818,6 +893,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 @@ -837,14 +913,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) @@ -852,7 +931,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))); } @@ -876,7 +955,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); @@ -887,12 +966,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")); } @@ -909,9 +993,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; } @@ -924,18 +1008,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); - retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),old_dentry->d_name.name, - 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); + + } 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 @@ -952,7 +1062,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) { @@ -973,10 +1083,14 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) return error; } +#if defined(CONFIG_KERNEL_2_5) /* Added NCB 185-8-2003 */ +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((KERN_DEBUG"yaffs_statfs\n")); + T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_statfs\n")); yaffs_GrossLock(dev); @@ -1003,7 +1117,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); @@ -1083,10 +1197,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",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 @@ -1111,6 +1225,9 @@ 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->nReservedBlocks = 5; dev->writeChunkToNAND = nandemul_WriteChunkToNAND; dev->readChunkFromNAND = nandemul_ReadChunkFromNAND; @@ -1130,7 +1247,13 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl printk(KERN_DEBUG "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) { @@ -1138,26 +1261,31 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl 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); 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); + //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); 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; @@ -1175,7 +1303,11 @@ 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) + sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL); +#else sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL); +#endif if(!dev) { // Deep shit could not allocate device structure @@ -1191,6 +1323,11 @@ 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; + dev->nReservedBlocks = 5; + dev->nShortOpCaches = 10; // Enable short op caching + // ... and the functions. dev->writeChunkToNAND = nandmtd_WriteChunkToNAND; @@ -1199,6 +1336,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; @@ -1211,7 +1352,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))); @@ -1220,13 +1361,17 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl if (!inode) return NULL; + +// added NCB + inode->i_op = & yaffs_dir_inode_operations; + inode->i_fop = & yaffs_dir_operations; - 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); @@ -1234,11 +1379,39 @@ 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; } +static int yaffs_internal_read_super_ram(struct super_block * sb, void * data, int silent) +{ + return yaffs_internal_read_super(1,sb,data,silent) ? 0 : -1; +} +static int yaffs_internal_read_super_mtd(struct super_block * sb, void * data, int silent) +{ + return yaffs_internal_read_super(0,sb,data,silent) ? 0 : -1; +} + + #ifdef CONFIG_YAFFS_MTD_ENABLED +#if defined(CONFIG_KERNEL_2_5) +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 static struct super_block *yaffs_read_super(struct super_block * sb, void * data, int silent) { return yaffs_internal_read_super(0,sb,data,silent); @@ -1246,15 +1419,35 @@ 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 #ifdef CONFIG_YAFFS_RAM_ENABLED +#if defined(CONFIG_KERNEL_2_5) +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); +} + +/* 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 = "yaffsram", + .get_sb = yaffs_ram_read_super, +// .kill_sb = kill_block_super, + .kill_sb = kill_litter_super, + .fs_flags = FS_SINGLE, +}; +#else static struct super_block *yaffs_ram_read_super(struct super_block * sb, void * data, int silent) { return yaffs_internal_read_super(1,sb,data,silent); } static DECLARE_FSTYPE(yaffs_ram_fs_type, "yaffsram", yaffs_ram_read_super, FS_SINGLE); +#endif #endif // CONFIG_YAFFS_RAM_ENABLED @@ -1279,12 +1472,19 @@ 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); + buf +=sprintf(buf,"eccUnfixed......... %d\n",dev->eccUnfixed); + buf +=sprintf(buf,"tagsEccFixed....... %d\n",dev->tagsEccFixed); + buf +=sprintf(buf,"tagsEccUnfixed..... %d\n",dev->tagsEccUnfixed); buf +=sprintf(buf,"cacheHits.......... %d\n",dev->cacheHits); 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; } @@ -1299,14 +1499,14 @@ static int yaffs_proc_read( ) { - char my_buffer[2000]; + char my_buffer[3000]; char *buf; buf = my_buffer; if (offset > 0) return 0; /* Fill the buffer and get its length */ - buf +=sprintf(buf,"YAFFS built:"__DATE__ " "__TIME__"\n"); + 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"); @@ -1357,7 +1557,7 @@ static int __init init_yaffs_fs(void) } #ifdef CONFIG_YAFFS_RAM_ENABLED - +#if 0 my_proc_ram_write_entry = create_proc_entry("yaffs_ram", S_IRUGO | S_IFREG, &proc_root); @@ -1370,6 +1570,8 @@ static int __init init_yaffs_fs(void) { my_proc_ram_write_entry->write_proc = yaffs_proc_ram_write; } +#endif + error = register_filesystem(&yaffs_ram_fs_type); if(error) {