* 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 patches marked NCB.
+ * * Some code bodily lifted from JFFS2.
*/
#include "yaffs_guts.h"
-#ifdef YAFFS_RAM_ENABLED
+#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
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 void yaffs_put_inode (struct inode *inode);
static int yaffs_readpage(struct file *file, 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
+ 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,
};
{
T(("yaffs_put_inode: ino %d, count %d\n",(int)inode->i_ino, atomic_read(&inode->i_count)));
- yaffs_FlushFile(yaffs_InodeToObject(inode));
+ // yaffs_FlushFile(yaffs_InodeToObject(inode));
}
+static int yaffs_file_flush(struct file* file)
+{
+ yaffs_Object *obj = yaffs_DentryToObject(file->f_dentry);
+
+ T((KERN_DEBUG"yaffs_file_flush object %d (%s)\n",obj->objectId,
+ obj->dirty ? "dirty" : "clean"));
+
+ yaffs_FlushFile(obj);
+
+ return 0;
+}
-static int yaffs_readpage(struct file *f, struct page * pg)
+
+
+static int yaffs_readpage_nolock(struct file *f, struct page * pg)
{
+ // Lifted from jffs2
+
yaffs_Object *obj;
unsigned char *pg_buf;
int ret;
flush_dcache_page(pg);
kunmap(pg);
- UnlockPage(pg);
+
//up(&obj->sem);
return ret;
}
-#ifdef YAFFS_ADDRESS_OPS
+static int yaffs_readpage_unlock(struct file *f, struct page *pg)
+{
+ int ret = yaffs_readpage_nolock(f,pg);
+ UnlockPage(pg);
+ return ret;
+}
-static int yaffs_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to)
+static int yaffs_readpage(struct file *f, struct page * pg)
{
- T((KERN_DEBUG"yaffs_prepare_write\n"));
+ return yaffs_readpage_unlock(f,pg);
+}
+
+
+static int yaffs_prepare_write(struct file *f, struct page *pg, unsigned offset, unsigned to)
+{
+
+ T((KERN_DEBUG"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 = addr;
- T((KERN_DEBUG"yaffs_commit_write\n"));
+ T((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));
+ SetPageError(pg);
+ ClearPageUptodate(pg);
+ }
+ else
+ {
+ SetPageUptodate(pg);
+ }
+
+ T((KERN_DEBUG"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)
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_blksize = inode->i_sb->s_blocksize;
inode->i_blocks = 0;
inode->i_rdev = obj->st_rdev;;
inode->i_atime = obj->st_atime;
}
+
static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_t *pos)
{
yaffs_Object *obj;
obj = yaffs_DentryToObject(f->f_dentry);
inode = f->f_dentry->d_inode;
- nWritten = yaffs_WriteDataToFile(obj,buf,*pos,n);
- ipos = *pos;
+
+ if(!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
+ {
+ ipos = inode->i_size;
+ }
+ else
+ {
+ ipos = *pos;
+ }
+
+
+ if(!obj)
+ {
+ T((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));
+ }
+
+ nWritten = yaffs_WriteDataToFile(obj,buf,ipos,n);
+
T((KERN_DEBUG"yaffs_file_write writing %d bytes, %d written at %d\n",n,nWritten,ipos));
if(nWritten > 0)
{
- *pos += nWritten;
- ipos = *pos;
- if(*pos > inode->i_size)
+ 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 + inode->i_blksize - 1)/ inode->i_blksize;
+
+ T((KERN_DEBUG"yaffs_file_write size updated to %d bytes, %d blocks\n",ipos,inode->i_blocks));
}
}
- return nWritten;
+ return nWritten != n ? -ENOSPC : nWritten;
}
static int yaffs_unlink(struct inode * dir, struct dentry *dentry)
{
- T((KERN_DEBUG"yaffs_unlink\n"));
+ T((KERN_DEBUG"yaffs_unlink %d:%s\n",dir->i_ino,dentry->d_name.name));
if(yaffs_Unlink(yaffs_InodeToObject(dir),dentry->d_name.name) == YAFFS_OK)
{
struct inode *inode = dentry->d_inode;
int error;
- T((KERN_DEBUG"yaffs_setattr\n"));
+ T((KERN_DEBUG"yaffs_setattr of object %d\n",yaffs_InodeToObject(inode)->objectId));
if((error = inode_change_ok(inode,attr)) == 0)
{
T((KERN_DEBUG"yaffs_statfs\n"));
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 = yaffs_SuperToDevice(sb)->nBlocks * 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(yaffs_SuperToDevice(sb))/
+ (sb->s_blocksize/YAFFS_BYTES_PER_CHUNK);
+ buf->f_bavail = buf->f_bfree;
return 0;
}
{
dev->putSuperFunc(sb);
}
+ yaffs_Deinitialise(dev);
+ kfree(dev);
}
-#ifdef YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_MTD_ENABLED
static void yaffs_MTDPutSuper(struct super_block *sb)
{
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;
printk(KERN_INFO"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_read_super: %s block size %d\n", useRam ? "RAM" : "MTD",sb->s_blocksize));
+
+#ifdef CONFIG_YAFFS_DISABLE_WRITE_VERIFY
+ T(("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);
}
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",
return sb;
}
-#ifdef YAFFS_MTD_ENABLED
+#ifdef CONFIG_YAFFS_MTD_ENABLED
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
-#ifdef YAFFS_RAM_ENABLED
+#ifdef CONFIG_YAFFS_RAM_ENABLED
static struct super_block *yaffs_ram_read_super(struct super_block * sb, void * data, int silent)
{
}
static DECLARE_FSTYPE(yaffs_ram_fs_type, "yaffsram", yaffs_ram_read_super, FS_SINGLE);
-#endif // YAFFS_RAM_ENABLED
+#endif // CONFIG_YAFFS_RAM_ENABLED
static struct proc_dir_entry *my_proc_entry;
int error = 0;
printk(KERN_DEBUG "yaffs " __DATE__ " " __TIME__ " Initialisation\n");
+#ifdef CONFIG_YAFFS_USE_GENERIC_RW
+ printk(KERN_DEBUG "yaffs is using generic read/write (caching)\n");
+#else
+ printk(KERN_DEBUG "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
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;
}
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
projects / yaffs / .git / blobdiff