* Special notes:
* >> sb->u.generic_sbp points to the yaffs_Device associated with this superblock
* >> inode->u.generic_ip points to the associated yaffs_Object.
+ *
+ *
+ * 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.
+ * * Michael Fischer for finding the problem with inode inconsistency.
+ * * Some code bodily lifted from JFFS2.
*/
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.41 2005-10-11 23:43:27 charles Exp $";
+extern const char *yaffs_guts_c_version;
+
+
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/mtd/mtd.h>
#include <linux/interrupt.h>
#include <linux/string.h>
+
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+
+#include <linux/statfs.h> /* Added NCB 15-8-2003 */
+#include <asm/statfs.h>
+#define UnlockPage(p) unlock_page(p)
+#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags)
+//#define kdevname(x) cdevname(to_kdev_t(x))
+#define kdevname(x) "(unavailable)" // temporary fix
+
+#else
+
#include <linux/locks.h>
+#endif
+
+
#include <asm/uaccess.h>
+#include "yportenv.h"
#include "yaffs_guts.h"
-#ifdef YAFFS_RAM_ENABLED
+
+
+
+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
#define YAFFS_RAM_EMULATION_SIZE 0x200000
-#endif //YAFFS_RAM_ENABLED
+#endif //CONFIG_YAFFS_RAM_ENABLED
-#ifdef YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_MTD_ENABLED
#include <linux/mtd/mtd.h>
#include "yaffs_mtdif.h"
-#endif //YAFFS_MTD_ENABLED
+#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)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->s_fs_info)
+#else
+#define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->u.generic_sbp)
+#endif
static void yaffs_put_super(struct super_block *sb);
static ssize_t yaffs_file_read(struct file *f, char *buf, size_t n, loff_t *pos);
static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_t *pos);
+static int yaffs_file_flush(struct file* file);
static int yaffs_sync_object(struct file * file, struct dentry *dentry, int datasync);
static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
+//#if defined(CONFIG_KERNEL_2_5) /* Added NCB 185-8-2003 */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *n);
+static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *n);
+#else
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)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev);
+#else
static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev);
+#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 */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
+#else
static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
+#endif
static void yaffs_read_inode (struct inode *inode);
+
+//#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static struct super_block *yaffs_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data);
+#else
static struct super_block *yaffs_read_super(struct super_block * sb, void * data, int silent);
+#endif
+
static void yaffs_put_inode (struct inode *inode);
-static int yaffs_readpage(struct file *file, struct page * page);
+static void yaffs_delete_inode(struct inode *);
+static void yaffs_clear_inode(struct inode *);
+static int yaffs_readpage(struct file *file, struct page * page);
+static int yaffs_writepage(struct page *page);
+static int yaffs_prepare_write(struct file *f, struct page *pg, unsigned offset, unsigned to);
+static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, unsigned to);
static int yaffs_readlink(struct dentry *dentry, char *buffer, int buflen);
static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-
static struct address_space_operations yaffs_file_address_operations = {
readpage: yaffs_readpage,
-// prepare_write: yaffs_prepare_write,
-// commit_write: yaffs_commit_write
+ writepage: yaffs_writepage,
+ prepare_write: yaffs_prepare_write,
+ commit_write: yaffs_commit_write
};
static struct file_operations yaffs_file_operations = {
+#ifdef CONFIG_YAFFS_USE_GENERIC_RW
+ read: generic_file_read,
+ write: generic_file_write,
+#else
read: yaffs_file_read,
write: yaffs_file_write,
+#endif
mmap: generic_file_mmap,
+ flush: yaffs_file_flush,
fsync: yaffs_sync_object,
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+ sendfile: generic_file_sendfile,
+#endif
};
read_inode: yaffs_read_inode,
put_inode: yaffs_put_inode,
put_super: yaffs_put_super,
-// read_inode:
// remount_fs:
-// clear_inode:
+ delete_inode: yaffs_delete_inode,
+ clear_inode: yaffs_clear_inode,
};
+static void yaffs_GrossLock(yaffs_Device *dev)
+{
+ T(YAFFS_TRACE_OS,("yaffs locking\n"));
+
+ down(&dev->grossLock);
+}
+
+static void yaffs_GrossUnlock(yaffs_Device *dev)
+{
+ T(YAFFS_TRACE_OS,("yaffs unlocking\n"));
+ up(&dev->grossLock);
+}
static int yaffs_readlink(struct dentry *dentry, char *buffer, int buflen)
{
unsigned char *alias;
int ret;
+ yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
+
+
+ yaffs_GrossLock(dev);
+
alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry));
+ yaffs_GrossUnlock(dev);
+
if(!alias)
return -ENOMEM;
{
unsigned char *alias;
int ret;
+ yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
+
+
+ yaffs_GrossLock(dev);
+
alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry));
+ yaffs_GrossUnlock(dev);
+
if(!alias)
return -ENOMEM;
/*
* Lookup is used to find objects in the fs
*/
+//#if defined(CONFIG_KERNEL_2_5) /* Added NCB 185-8-2003 */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+
+static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *n)
+#else
static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry)
+#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;
+
+
+ yaffs_GrossLock(dev);
+
- T((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);
obj = yaffs_GetEquivalentObject(obj); // in case it was a hardlink
+
+
if(obj)
{
- T((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);
+ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode,0,obj);
if(inode)
{
- T((KERN_DEBUG"yaffs_loookup looks good\n"));
- dget(dentry); // try to solve directory bug
+ 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
d_add(dentry,inode);
- return dentry;
+
+ yaffs_GrossUnlock(dev);
+
+ // return dentry;
+ return NULL;
+#endif
}
}
else
{
- T((KERN_DEBUG"yaffs_lookup not found\n"));
+ T(YAFFS_TRACE_OS,("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));
}
// For now put inode is just for debugging
+// 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 nlink %d\n",
+ (int)inode->i_ino, atomic_read(&inode->i_count), inode->i_nlink));
+
+}
+
+// clear is called to tell the fs to release any per-inode data it holds
+static void yaffs_clear_inode(struct inode *inode)
+{
+ yaffs_Object *obj;
+ yaffs_Device *dev;
+
+ obj = yaffs_InodeToObject(inode);
+
+ T(YAFFS_TRACE_OS,("yaffs_clear_inode: ino %d, count %d %s\n",(int)inode->i_ino, atomic_read(&inode->i_count),
+ obj ? "object exists" : "null object"));
+
+ if(obj)
+ {
+ dev = obj->myDev;
+ yaffs_GrossLock(dev);
+
+ // Clear the association between the inode ant the yaffs_Object.
+ obj->myInode = NULL;
+ inode->u.generic_ip = NULL;
+
+ // If the object freeing was deferred, then the real free happens now.
+ // This should fix the inode inconsistency problem.
+
+ yaffs_HandleDeferedFree(obj);
+
+ yaffs_GrossUnlock(dev);
+ }
- yaffs_FlushFile(yaffs_InodeToObject(inode));
}
+// delete is called when the link count is zero and the inode
+// is put (ie. nobody wants to know about it anymore, time to
+// delete the file).
+// NB Must call clear_inode()
+static void yaffs_delete_inode(struct inode *inode)
+{
+ yaffs_Object *obj = yaffs_InodeToObject(inode);
+ yaffs_Device *dev;
+ 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)
+ {
+ dev = obj->myDev;
+ yaffs_GrossLock(dev);
+ yaffs_DeleteFile(obj);
+ yaffs_GrossUnlock(dev);
+ }
+ clear_inode(inode);
+}
-static int yaffs_readpage(struct file *f, struct page * pg)
+
+static int yaffs_file_flush(struct file* file)
{
- struct yaffs_Object *obj;
- unsigned char *pg_buf;
- int ret;
+ yaffs_Object *obj = yaffs_DentryToObject(file->f_dentry);
+
+ yaffs_Device *dev = obj->myDev;
- T((KERN_DEBUG"yaffs_readpage at %08x, size %08x\n",
- pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE));
+ T(YAFFS_TRACE_OS,("yaffs_file_flush object %d (%s)\n",obj->objectId,
+ obj->dirty ? "dirty" : "clean"));
+
+ yaffs_GrossLock(dev);
+
+ yaffs_FlushFile(obj,1);
+
+ yaffs_GrossUnlock(dev);
+
+ return 0;
+}
+
+
+
+static int yaffs_readpage_nolock(struct file *f, struct page * pg)
+{
+ // Lifted from jffs2
+
+ yaffs_Object *obj;
+ unsigned char *pg_buf;
+ int ret;
+
+ yaffs_Device *dev;
+
+ 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);
- //down(obj->sem);
+ dev = obj->myDev;
+
if (!PageLocked(pg))
PAGE_BUG(pg);
pg_buf = kmap(pg);
/* FIXME: Can kmap fail? */
- ret = yaffs_ReadDataFromFile(obj,pg_buf, pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE);
+ yaffs_GrossLock(dev);
+
+ ret = yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE);
+ yaffs_GrossUnlock(dev);
+
if(ret >= 0) ret = 0;
if (ret) {
flush_dcache_page(pg);
kunmap(pg);
- UnlockPage(pg);
- //up(&obj->sem);
+ T(YAFFS_TRACE_OS,("yaffs_readpage done\n"));
+ return ret;
+}
- T((KERN_DEBUG"yaffs_readpage done\n"));
+static int yaffs_readpage_unlock(struct file *f, struct page *pg)
+{
+ int ret = yaffs_readpage_nolock(f,pg);
+ UnlockPage(pg);
return ret;
}
-#ifdef YAFFS_ADDRESS_OPS
+static int yaffs_readpage(struct file *f, struct page * pg)
+{
+ return yaffs_readpage_unlock(f,pg);
+}
-static int yaffs_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to)
+// writepage inspired by/stolen from smbfs
+//
+
+static int yaffs_writepage(struct page *page)
{
- T((KERN_DEBUG"yaffs_prepare_write\n"));
+ struct address_space *mapping = page->mapping;
+ struct inode *inode;
+ unsigned long end_index;
+ char *buffer;
+ yaffs_Object *obj;
+ int nWritten = 0;
+ unsigned nBytes;
+
+ if (!mapping)
+ BUG();
+ inode = mapping->host;
+ if (!inode)
+ BUG();
+
+ end_index = inode->i_size >> PAGE_CACHE_SHIFT;
+
+ /* easy case */
+ if (page->index < end_index)
+ {
+ nBytes = PAGE_CACHE_SIZE;
+ }
+ else
+ {
+ nBytes = inode->i_size & (PAGE_CACHE_SIZE-1);
+ }
+ // What's happening here?
+ ///* OK, are we completely out? */
+ //if (page->index >= end_index+1 || !offset)
+ // return -EIO;
+
+ get_page(page);
+
+
+ buffer = kmap(page);
+
+ obj = yaffs_InodeToObject(inode);
+ yaffs_GrossLock(obj->myDev);
+
+
+ nWritten = yaffs_WriteDataToFile(obj,buffer,page->index << PAGE_CACHE_SHIFT,nBytes);
+
+ yaffs_GrossUnlock(obj->myDev);
+
+ kunmap(page);
+ SetPageUptodate(page);
+ UnlockPage(page);
+ put_page(page);
+
+ return (nWritten == nBytes) ? 0 : -ENOSPC;
+}
+
+
+
+static int yaffs_prepare_write(struct file *f, struct page *pg, unsigned offset, unsigned to)
+{
+
+ T(YAFFS_TRACE_OS,("yaffs_prepair_write\n"));
+ if(!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
+ return yaffs_readpage_nolock(f,pg);
- //TODO
return 0;
+
}
-static int yaffs_commit_write(struct file *file, struct page *page, unsigned offset, unsigned to)
+static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, unsigned to)
{
- struct inode *inode = page->mapping->host;
- loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
+ void *addr = page_address(pg) + offset;
+ loff_t pos = (((loff_t)pg->index) << PAGE_CACHE_SHIFT) + offset;
+ int nBytes = to - offset;
+ int nWritten;
+
+ unsigned spos = pos;
+ unsigned saddr = (unsigned)addr;
- T((KERN_DEBUG"yaffs_commit_write\n"));
+ 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,("yaffs_commit_write not same size nWritten %d nBytes %d\n",nWritten,nBytes));
+ SetPageError(pg);
+ ClearPageUptodate(pg);
+ }
+ else
+ {
+ SetPageUptodate(pg);
+ }
+
+ T(YAFFS_TRACE_OS,("yaffs_commit_write returning %d\n",nWritten));
+
+ return nWritten;
- return 0;
}
-#endif //YAFFS_ADDRESS_OPS
static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
if (inode && obj)
{
inode->i_ino = obj->objectId;
- inode->i_mode = obj->st_mode;
- inode->i_uid = obj->st_uid;
- inode->i_gid = obj->st_gid;
- inode->i_blksize = YAFFS_BYTES_PER_CHUNK;
- inode->i_blocks = 0;
- inode->i_rdev = NODEV;
- inode->i_atime = obj->st_atime;
- inode->i_mtime = obj->st_mtime;
- inode->i_ctime = obj->st_ctime;
+ inode->i_mode = obj->yst_mode;
+ inode->i_uid = obj->yst_uid;
+ inode->i_gid = obj->yst_gid;
+ inode->i_blksize = inode->i_sb->s_blocksize;
+//#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+
+ inode->i_rdev = old_decode_dev(obj->yst_rdev);
+ inode->i_atime.tv_sec = (time_t)(obj->yst_atime);
+ inode->i_atime.tv_nsec = 0;
+ inode->i_mtime.tv_sec = (time_t)obj->yst_mtime;
+ inode->i_mtime.tv_nsec =0;
+ inode->i_ctime.tv_sec = (time_t)obj->yst_ctime;
+ inode->i_ctime.tv_nsec = 0;
+#else
+ inode->i_rdev = obj->yst_rdev;
+ inode->i_atime = obj->yst_atime;
+ inode->i_mtime = obj->yst_mtime;
+ inode->i_ctime = obj->yst_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,("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)
+ switch (obj->yst_mode & S_IFMT)
{
- default:
- // init_special_inode(inode, mode, dev);
+ default: // fifo, device or socket
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+ init_special_inode(inode, obj->yst_mode,old_decode_dev(obj->yst_rdev));
+#else
+ init_special_inode(inode, obj->yst_mode,(dev_t)(obj->yst_rdev));
+#endif
break;
case S_IFREG: // file
inode->i_op = &yaffs_file_inode_operations;
inode->u.generic_ip = obj;
+ obj->myInode = inode;
}
else
{
- T((KERN_DEBUG"yaffs_FileInode invalid parameters\n"));
+ T(YAFFS_TRACE_OS,("yaffs_FileInode invalid parameters\n"));
}
}
{
struct inode * inode;
- T((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);
- // No need to call this since iget calls it via the read_inode callback
- // yaffs_FillInodeFromObject(inode,obj);
-
+ // NB Side effect: iget calls back to yaffs_read_inode().
+ // iget also increments the inode's i_count
+
return inode;
}
yaffs_Object *obj;
int nRead,ipos;
struct inode *inode;
+ yaffs_Device *dev;
- T((KERN_DEBUG"yaffs_file_read\n"));
+ T(YAFFS_TRACE_OS,("yaffs_file_read\n"));
obj = yaffs_DentryToObject(f->f_dentry);
+
+ dev = obj->myDev;
+
+ yaffs_GrossLock(dev);
+
inode = f->f_dentry->d_inode;
if (*pos < inode->i_size)
{
f->f_pos += nRead;
}
+
+ yaffs_GrossUnlock(dev);
+
ipos = *pos;
- T((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;
}
+
static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_t *pos)
{
yaffs_Object *obj;
int nWritten,ipos;
struct inode *inode;
+ yaffs_Device *dev;
+
obj = yaffs_DentryToObject(f->f_dentry);
+
+ dev = obj->myDev;
+
+ yaffs_GrossLock(dev);
+
inode = f->f_dentry->d_inode;
- nWritten = yaffs_WriteDataToFile(obj,buf,*pos,n);
- ipos = *pos;
- T((KERN_DEBUG"yaffs_file_write writing %d bytes, %d written at %d\n",n,nWritten,ipos));
- if(nWritten > 0)
+
+ if(!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
+ {
+ ipos = inode->i_size;
+ }
+ else
{
- *pos += nWritten;
ipos = *pos;
- if(*pos > inode->i_size)
+ }
+
+
+ if(!obj)
+ {
+ T(YAFFS_TRACE_OS,("yaffs_file_write: hey obj is null!\n"));
+ }
+ else
+ {
+ 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,("yaffs_file_write writing %d bytes, %d written at %d\n",n,nWritten,ipos));
+ if(nWritten > 0)
+ {
+ ipos += nWritten;
+ *pos = ipos;
+ if(ipos > inode->i_size)
{
- inode->i_size = *pos;
- T((KERN_DEBUG"yaffs_file_write size updated to %d\n",ipos));
+ inode->i_size = ipos;
+ inode->i_blocks = (ipos + 511)>>9;
+
+ T(YAFFS_TRACE_OS,("yaffs_file_write size updated to %d bytes, %d blocks\n",ipos,(int)(inode->i_blocks)));
}
}
- return nWritten;
+ yaffs_GrossUnlock(dev);
+
+ return nWritten != n ? -ENOSPC : nWritten;
}
static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
{
yaffs_Object *obj;
+ yaffs_Device *dev;
struct inode *inode = f->f_dentry->d_inode;
unsigned long offset, curoffs;
struct list_head *i;
char name[YAFFS_MAX_NAME_LENGTH +1];
obj = yaffs_DentryToObject(f->f_dentry);
+ dev = obj->myDev;
+
+ yaffs_GrossLock(dev);
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,("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,("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;
curoffs = 1;
- //down(&obj->sem);
-
-
list_for_each(i,&obj->variant.directoryVariant.children)
{
curoffs++;
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,("yaffs_readdir: %s inode %d\n",name,yaffs_GetObjectInode(l)));
if(filldir(dirent,
name,
}
up_and_out:
-
- //up(&obj->sem);
-
out:
+
+ yaffs_GrossUnlock(dev);
+
return 0;
}
/*
* 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)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
+#else
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev)
+#endif
{
struct inode *inode;
yaffs_Object *obj = NULL;
+ yaffs_Device *dev;
+
yaffs_Object *parent = yaffs_InodeToObject(dir);
int error = -ENOSPC;
if(parent)
{
- T((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((KERN_DEBUG"yaffs_mknod: could not get parent object\n"));
+ T(YAFFS_TRACE_OS,("yaffs_mknod: could not get parent object\n"));
return -EPERM;
}
- T(("yaffs_mknod: making oject for %s, mode %x\n",
- dentry->d_name.name, mode));
+ T(YAFFS_TRACE_OS,("yaffs_mknod: making oject for %s, mode %x dev %x\n",
+ dentry->d_name.name, mode,rdev));
+
+ dev = parent->myDev;
+
+ yaffs_GrossLock(dev);
switch (mode & S_IFMT)
{
default:
-
+ // Special (socket, fifo, device...)
+ T(YAFFS_TRACE_OS,("yaffs_mknod: making special\n"));
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+ obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,old_encode_dev(rdev));
+#else
+ obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,rdev);
+#endif
break;
case S_IFREG: // file
- T((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((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((KERN_DEBUG"yaffs_mknod: making file\n"));
+ T(YAFFS_TRACE_OS,("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,("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,("yaffs_mknod failed making object\n"));
error = -ENOMEM;
}
-
+
+ yaffs_GrossUnlock(dev);
return error;
}
static int yaffs_mkdir(struct inode * dir, struct dentry * dentry, int mode)
{
int retVal;
- T((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
return retVal;
}
+//#if defined(CONFIG_KERNEL_2_5) /* Added NCB 185-8-2003 */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *n)
+#else
static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
+#endif
{
- T((KERN_DEBUG"yaffs_create\n"));
+ T(YAFFS_TRACE_OS,("yaffs_create\n"));
return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
}
static int yaffs_unlink(struct inode * dir, struct dentry *dentry)
{
+ int retVal;
+
+ yaffs_Device *dev;
+
+
+ T(YAFFS_TRACE_OS,("yaffs_unlink %d:%s\n",(int)(dir->i_ino),dentry->d_name.name));
+
+ dev = yaffs_InodeToObject(dir)->myDev;
+
+ yaffs_GrossLock(dev);
+
+
+ retVal = yaffs_Unlink(yaffs_InodeToObject(dir),dentry->d_name.name);
+
- T((KERN_DEBUG"yaffs_unlink\n"));
+ yaffs_GrossUnlock(dev);
- if(yaffs_Unlink(yaffs_InodeToObject(dir),dentry->d_name.name) == YAFFS_OK)
+ if( retVal == YAFFS_OK)
{
+ dentry->d_inode->i_nlink--;
+ mark_inode_dirty(dentry->d_inode);
return 0;
}
else
struct inode *inode = old_dentry->d_inode;
yaffs_Object *obj = NULL;
yaffs_Object *link=NULL;
+ yaffs_Device *dev;
- T((KERN_DEBUG"yaffs_link\n"));
+ T(YAFFS_TRACE_OS,("yaffs_link\n"));
obj = yaffs_InodeToObject(inode);
+ dev = obj->myDev;
+
+ yaffs_GrossLock(dev);
+
+ 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(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)));
+
+ }
- link = yaffs_Link(yaffs_InodeToObject(dir),dentry->d_name.name,obj);
+ yaffs_GrossUnlock(dev);
+
if(link)
{
+
return 0;
}
static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char * symname)
{
yaffs_Object *obj;
+ yaffs_Device *dev;
- T((KERN_DEBUG"yaffs_symlink\n"));
+ T(YAFFS_TRACE_OS,("yaffs_symlink\n"));
+ dev = yaffs_InodeToObject(dir)->myDev;
+ yaffs_GrossLock(dev);
obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
S_IFLNK | S_IRWXUGO, current->uid, current->gid,
symname);
+ yaffs_GrossUnlock(dev);
if(obj)
{
- T((KERN_DEBUG"symlink created OK\n"));
+
+ struct inode* inode;
+
+ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
+ d_instantiate(dentry, inode);
+ T(YAFFS_TRACE_OS,("symlink created OK\n"));
return 0;
}
else
{
- T((KERN_DEBUG"symlink not created\n"));
+ T(YAFFS_TRACE_OS,("symlink not created\n"));
}
static int yaffs_sync_object(struct file * file, struct dentry *dentry, int datasync)
{
- T((KERN_DEBUG"yaffs_sync_object\n"));
- yaffs_FlushFile(yaffs_DentryToObject(dentry));
+ yaffs_Object *obj;
+ yaffs_Device *dev;
+
+ obj = yaffs_DentryToObject(dentry);
+
+ dev = obj->myDev;
+
+ T(YAFFS_TRACE_OS,("yaffs_sync_object\n"));
+ yaffs_GrossLock(dev);
+ yaffs_FlushFile(obj,1);
+ yaffs_GrossUnlock(dev);
return 0;
}
/*
* The VFS layer already does all the dentry stuff for rename.
+ *
+ * NB: POSIX says you can rename an object over an old object of the same name
*/
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 = YAFFS_FAIL;
+ int removed = 0;
+ yaffs_Object *target;
+
+ dev = yaffs_InodeToObject(old_dir)->myDev;
+
+ yaffs_GrossLock(dev);
+
+ // 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( yaffs_RenameObject(yaffs_InodeToObject(old_dir),old_dentry->d_name.name,
- yaffs_InodeToObject(new_dir),new_dentry->d_name.name) == YAFFS_OK)
+ if(retVal == YAFFS_OK)
{
+ if(removed == YAFFS_OK)
+ {
+ new_dentry->d_inode->i_nlink--;
+ mark_inode_dirty(new_dentry->d_inode);
+ }
+
return 0;
}
else
{
struct inode *inode = dentry->d_inode;
int error;
+ yaffs_Device *dev;
- T((KERN_DEBUG"yaffs_setattr\n"));
+ T(YAFFS_TRACE_OS,("yaffs_setattr of object %d\n",yaffs_InodeToObject(inode)->objectId));
if((error = inode_change_ok(inode,attr)) == 0)
{
+ dev = yaffs_InodeToObject(inode)->myDev;
+ yaffs_GrossLock(dev);
if(yaffs_SetAttributes(yaffs_InodeToObject(inode),attr) == YAFFS_OK)
{
error = 0;
{
error = -EPERM;
}
-
- inode_setattr(inode,attr);
+ yaffs_GrossUnlock(dev);
+ error = inode_setattr(inode,attr);
}
return error;
}
+//#if defined(CONFIG_KERNEL_2_5) /* Added NCB 185-8-2003 */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
+#else
static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
+#endif
{
- T((KERN_DEBUG"yaffs_statfs\n"));
+ yaffs_Device *dev = yaffs_SuperToDevice(sb);
+ T(YAFFS_TRACE_OS,("yaffs_statfs\n"));
+ yaffs_GrossLock(dev);
+
buf->f_type = YAFFS_MAGIC;
- buf->f_bsize = YAFFS_BYTES_PER_CHUNK;
+ buf->f_bsize = sb->s_blocksize;
buf->f_namelen = 255;
- buf->f_blocks = yaffs_SuperToDevice(sb)->nBlocks * YAFFS_CHUNKS_PER_BLOCK;
+ buf->f_blocks = (dev->endBlock - dev->startBlock + 1) * YAFFS_CHUNKS_PER_BLOCK/
+ (sb->s_blocksize/YAFFS_BYTES_PER_CHUNK);
buf->f_files = 0;
buf->f_ffree = 0;
- buf->f_bavail = buf->f_bfree = yaffs_GetNumberOfFreeChunks(yaffs_SuperToDevice(sb));
+ buf->f_bfree = yaffs_GetNumberOfFreeChunks(dev)/
+ (sb->s_blocksize/YAFFS_BYTES_PER_CHUNK);
+ buf->f_bavail = buf->f_bfree;
+
+ yaffs_GrossUnlock(dev);
return 0;
}
static void yaffs_read_inode (struct inode *inode)
{
-
+ // NB This is called as a side effect of other functions and
+ // thus gross locking should always be in place already.
+
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,("yaffs_read_inode for %d\n",(int)inode->i_ino));
- obj = yaffs_FindObjectByNumber(yaffs_SuperToDevice(inode->i_sb),inode->i_ino);
+ obj = yaffs_FindObjectByNumber(dev,inode->i_ino);
yaffs_FillInodeFromObject(inode,obj);
+
}
+
+static yaffs_Device *yaffs_dev;
+static yaffs_Device *yaffsram_dev;
+
+
+
static void yaffs_put_super(struct super_block *sb)
{
yaffs_Device *dev = yaffs_SuperToDevice(sb);
+ yaffs_GrossLock(dev);
if(dev->putSuperFunc)
{
dev->putSuperFunc(sb);
}
+ yaffs_Deinitialise(dev);
+ yaffs_GrossUnlock(dev);
+
+ if(dev == yaffs_dev) yaffs_dev = NULL;
+ if(dev == yaffsram_dev) yaffsram_dev = NULL;
+
+ kfree(dev);
}
-#ifdef YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_MTD_ENABLED
static void yaffs_MTDPutSuper(struct super_block *sb)
{
#endif
+
static struct super_block *yaffs_internal_read_super(int useRam, struct super_block * sb, void * data, int silent)
{
+ int nBlocks;
struct inode * inode;
struct dentry * root;
yaffs_Device *dev;
-
- T(("yaffs_read_super: %s\n", useRam ? "RAM" : "MTD"));
- sb->s_blocksize = YAFFS_BYTES_PER_CHUNK;
- sb->s_blocksize_bits = YAFFS_CHUNK_SIZE_SHIFT;
sb->s_magic = YAFFS_MAGIC;
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)));
+
+#ifdef CONFIG_YAFFS_USE_CHUNK_SIZE
+ sb->s_blocksize = YAFFS_BYTES_PER_CHUNK;
+ sb->s_blocksize_bits = YAFFS_CHUNK_SIZE_SHIFT;
+#else
+ sb->s_blocksize = PAGE_CACHE_SIZE;
+ sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+#endif
+ 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_TRACE_OS,("yaffs: Write verification disabled. All guarantees null and void\n"));
+#endif
+
+
if(useRam)
{
-#ifdef YAFFS_RAM_ENABLED
+#ifdef CONFIG_YAFFS_RAM_ENABLED
// Set the yaffs_Device up for ram emulation
sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL);
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;
}
memset(dev,0,sizeof(yaffs_Device));
dev->genericDevice = NULL; // Not used for RAM emulation.
- dev->nBlocks = YAFFS_RAM_EMULATION_SIZE / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
- dev->startBlock = 1; // Don't use block 0
- dev->endBlock = dev->nBlocks - 1;
+ nBlocks = YAFFS_RAM_EMULATION_SIZE / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
+ dev->startBlock = 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
dev->writeChunkToNAND = nandemul_WriteChunkToNAND;
dev->readChunkFromNAND = nandemul_ReadChunkFromNAND;
dev->eraseBlockInNAND = nandemul_EraseBlockInNAND;
dev->initialiseNAND = nandemul_InitialiseNAND;
+
+ yaffsram_dev = dev;
#endif
}
else
{
-#ifdef YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_MTD_ENABLED
struct mtd_info *mtd;
- printk(KERN_DEBUG "yaffs: Attempting MTD mount on %u.%u, \"%s\"\n",
- MAJOR(sb->s_dev),MINOR(sb->s_dev),kdevname(sb->s_dev));
+ T(YAFFS_TRACE_ALWAYS,( "yaffs: Attempting MTD mount on %u.%u, \"%s\"\n",
+ MAJOR(sb->s_dev),MINOR(sb->s_dev),kdevname(sb->s_dev)));
- // Hope it's a NAND mtd
+ // Check it's an mtd device.....
+ if(MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
+ {
+ return NULL; // This isn't an mtd device
+ }
+
+ // Get the device
mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
if (!mtd)
{
- printk(KERN_DEBUG "yaffs: MTD device #%u doesn't appear to exist\n", MINOR(sb->s_dev));
+ T(YAFFS_TRACE_ALWAYS,( "yaffs: MTD device #%u doesn't appear to exist\n", MINOR(sb->s_dev)));
return NULL;
}
+ // Check it's NAND
if(mtd->type != MTD_NANDFLASH)
{
- printk(KERN_DEBUG "yaffs: MTD device is not NAND it's type %d\n", mtd->type);
+ T(YAFFS_TRACE_ALWAYS,( "yaffs: MTD device is not NAND it's type %d\n", mtd->type));
return NULL;
}
- printk(KERN_DEBUG" erase %x\n",mtd->erase);
- printk(KERN_DEBUG" read %x\n",mtd->read);
- printk(KERN_DEBUG" write %x\n",mtd->write);
- printk(KERN_DEBUG" readoob %x\n",mtd->read_oob);
- printk(KERN_DEBUG" writeoob %x\n",mtd->write_oob);
- printk(KERN_DEBUG" oobblock %x\n",mtd->oobblock);
- printk(KERN_DEBUG" oobsize %x\n",mtd->oobsize);
+ //T(YAFFS_TRACE_OS,(KERN_DEBUG" erase %x\n",mtd->erase);
+ //T(YAFFS_TRACE_OS,(KERN_DEBUG" read %x\n",mtd->read);
+ //T(YAFFS_TRACE_OS,(KERN_DEBUG" write %x\n",mtd->write);
+ //T(YAFFS_TRACE_OS,(KERN_DEBUG" readoob %x\n",mtd->read_oob);
+ //T(YAFFS_TRACE_OS,(KERN_DEBUG" writeoob %x\n",mtd->write_oob);
+ //T(YAFFS_TRACE_OS,(KERN_DEBUG" oobblock %x\n",mtd->oobblock);
+ //T(YAFFS_TRACE_OS,(KERN_DEBUG" oobsize %x\n",mtd->oobsize);
if(!mtd->erase ||
!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");
+ 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;
}
// like it has the right capabilities
// Set the yaffs_Device up for ram emulation
+//#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+ sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL);
+#else
sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL);
+#endif
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;
}
// Set up the memory size parameters....
-// NCB dev->nBlocks = YAFFS_RAM_EMULATION_SIZE / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
- dev->nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
- dev->startBlock = 1; // Don't use block 0
- dev->endBlock = dev->nBlocks - 1;
+ nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
+ dev->startBlock = 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;
dev->readChunkFromNAND = nandmtd_ReadChunkFromNAND;
dev->eraseBlockInNAND = nandmtd_EraseBlockInNAND;
dev->initialiseNAND = nandmtd_InitialiseNAND;
-
+
dev->putSuperFunc = yaffs_MTDPutSuper;
+
+#ifdef CONFIG_YAFFS_USE_NANDECC
+ dev->useNANDECC = 1;
#endif
- }
-
+ yaffs_dev = dev;
+
+#endif
+ }
+ init_MUTEX(&dev->grossLock);
+
+
+ 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)));
+
+ yaffs_GrossUnlock(dev);
+
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);
}
sb->s_root = root;
- T(("yaffs_read_super: done\n"));
+ T(YAFFS_TRACE_OS,("yaffs_read_super: done\n"));
return sb;
}
-#ifdef YAFFS_MTD_ENABLED
+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)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static struct super_block *yaffs_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data)
+{
+
+ 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);
static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV);
#endif
+#endif
-#ifdef YAFFS_RAM_ENABLED
+#ifdef CONFIG_YAFFS_RAM_ENABLED
+//#if defined(CONFIG_KERNEL_2_5)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+static struct super_block *yaffs_ram_read_super(struct file_system_type * fs, int flags, const char *dev_name, void *data)
+{
+
+ 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 // YAFFS_RAM_ENABLED
+#endif
+#endif // CONFIG_YAFFS_RAM_ENABLED
static struct proc_dir_entry *my_proc_entry;
+static struct proc_dir_entry *my_proc_ram_write_entry;
+
+static char * yaffs_dump_dev(char *buf,yaffs_Device *dev,char *name)
+{
+ buf +=sprintf(buf,"\nDevice %s\n",name);
+ buf +=sprintf(buf,"startBlock......... %d\n",dev->startBlock);
+ buf +=sprintf(buf,"endBlock........... %d\n",dev->endBlock);
+ buf +=sprintf(buf,"chunkGroupBits..... %d\n",dev->chunkGroupBits);
+ buf +=sprintf(buf,"chunkGroupSize..... %d\n",dev->chunkGroupSize);
+ buf +=sprintf(buf,"nErasedBlocks...... %d\n",dev->nErasedBlocks);
+ buf +=sprintf(buf,"nTnodesCreated..... %d\n",dev->nTnodesCreated);
+ buf +=sprintf(buf,"nFreeTnodes........ %d\n",dev->nFreeTnodes);
+ buf +=sprintf(buf,"nObjectsCreated.... %d\n",dev->nObjectsCreated);
+ buf +=sprintf(buf,"nFreeObjects....... %d\n",dev->nFreeObjects);
+ buf +=sprintf(buf,"nFreeChunks........ %d\n",dev->nFreeChunks);
+ buf +=sprintf(buf,"nPageWrites........ %d\n",dev->nPageWrites);
+ buf +=sprintf(buf,"nPageReads......... %d\n",dev->nPageReads);
+ 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);
+ buf +=sprintf(buf,"nShortOpCaches..... %d\n",dev->nShortOpCaches);
+
+ return buf;
+}
static int yaffs_proc_read(
char *page,
)
{
- static char my_buffer[1000];
+ char my_buffer[3000];
+ char *buf;
+ buf = my_buffer;
if (offset > 0) return 0;
/* Fill the buffer and get its length */
- sprintf( my_buffer,
- "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");
+
strcpy(page,my_buffer);
return strlen(my_buffer);
}
+
+static int yaffs_proc_ram_write(
+ char *page,
+ char **start,
+ off_t offset,
+ int count,
+ int *eof,
+ void *data
+ )
+{
+
+ T(YAFFS_TRACE_OS,( "yaffs write size %d\n",count));
+ return count;
+}
+
static int __init init_yaffs_fs(void)
{
int error = 0;
- printk(KERN_DEBUG "yaffs " __DATE__ " " __TIME__ " Initialisation\n");
+ yaffs_dev = yaffsram_dev = NULL;
+
+ T(YAFFS_TRACE_OS,( "yaffs " __DATE__ " " __TIME__ " Initialisation\n"));
+#ifdef CONFIG_YAFFS_USE_GENERIC_RW
+ T(YAFFS_TRACE_OS,( "yaffs is using generic read/write (caching)\n"));
+#else
+ T(YAFFS_TRACE_OS,( "yaffs is using direct read/write (uncached)\n"));
+#endif
+
+
/* Install the proc_fs entry */
my_proc_entry = create_proc_read_entry("yaffs",
S_IRUGO | S_IFREG,
return -ENOMEM;
}
-#ifdef YAFFS_RAM_ENABLED
+#ifdef CONFIG_YAFFS_RAM_ENABLED
+#if 0
+ my_proc_ram_write_entry = create_proc_entry("yaffs_ram",
+ S_IRUGO | S_IFREG,
+ &proc_root);
+
+ if(!my_proc_ram_write_entry)
+ {
+ return -ENOMEM;
+ }
+ else
+ {
+ my_proc_ram_write_entry->write_proc = yaffs_proc_ram_write;
+ }
+#endif
error = register_filesystem(&yaffs_ram_fs_type);
if(error)
{
return error;
}
-#endif //YAFFS_RAM_ENABLED
+#endif //CONFIG_YAFFS_RAM_ENABLED
-#ifdef YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_MTD_ENABLED
error = register_filesystem(&yaffs_fs_type);
if(error)
{
-#ifdef YAFFS_RAM_ENABLED
+#ifdef CONFIG_YAFFS_RAM_ENABLED
unregister_filesystem(&yaffs_ram_fs_type);
-#endif //YAFFS_RAM_ENABLED
+#endif //CONFIG_YAFFS_RAM_ENABLED
}
-#endif // YAFFS_MTD_ENABLED
+#endif // CONFIG_YAFFS_MTD_ENABLED
return error;
}
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);
-#ifdef YAFFS_RAM_ENABLED
+#ifdef CONFIG_YAFFS_RAM_ENABLED
unregister_filesystem(&yaffs_ram_fs_type);
#endif
-#ifdef YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_MTD_ENABLED
unregister_filesystem(&yaffs_fs_type);
#endif
MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002");
MODULE_LICENSE("GPL");
+