X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs%2F.git;a=blobdiff_plain;f=yaffs_fs.c;h=099a1083122eb1ff1f1cccc3c9fea0a4c2e84260;hp=418f378bf2487a69abac6037c52e419e83a4891d;hb=3b2905b66368db2b05df750b5abf4b41c6efcfbd;hpb=1ac8445c7e2f516db4a03a9d0715199279f9f134 diff --git a/yaffs_fs.c b/yaffs_fs.c index 418f378..099a108 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -28,7 +28,7 @@ */ -const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.30 2003-09-20 01:13:48 charles Exp $"; +const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.34 2004-09-20 22:00:20 charles Exp $"; extern const char *yaffs_guts_c_version; @@ -47,14 +47,19 @@ extern const char *yaffs_guts_c_version; #include -#if defined(CONFIG_KERNEL_2_5) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + #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)) +//#define kdevname(x) cdevname(to_kdev_t(x)) +#define kdevname(x) "(unavailable)" // temporary fix + #else + #include + #endif @@ -87,7 +92,8 @@ unsigned yaffs_traceMask = YAFFS_TRACE_ALWAYS | YAFFS_TRACE_BAD_BLOCKS; #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode) //NCB #define yaffs_SuperToDevice(sb) ((yaffs_Device *)sb->u.generic_sbp) -#if defined(CONFIG_KERNEL_2_5) +//#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) @@ -104,7 +110,8 @@ 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 */ +//#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 @@ -116,7 +123,8 @@ 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 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); @@ -124,14 +132,16 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int d 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 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 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); @@ -142,7 +152,7 @@ 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); @@ -154,6 +164,7 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); static struct address_space_operations yaffs_file_address_operations = { readpage: yaffs_readpage, + writepage: yaffs_writepage, prepare_write: yaffs_prepare_write, commit_write: yaffs_commit_write }; @@ -280,7 +291,9 @@ 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 */ +//#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) @@ -413,12 +426,12 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg) // Lifted from jffs2 yaffs_Object *obj; - unsigned char *pg_buf; + unsigned char *pg_buf; int ret; - + yaffs_Device *dev; - - T(YAFFS_TRACE_OS,(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); @@ -468,6 +481,63 @@ static int yaffs_readpage(struct file *f, struct page * pg) return yaffs_readpage_unlock(f,pg); } +// writepage inspired by/stolen from smbfs +// + +static int yaffs_writepage(struct page *page) +{ + 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) { @@ -523,8 +593,10 @@ 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; -#if defined(CONFIG_KERNEL_2_5) - inode->i_rdev = to_kdev_t(obj->st_rdev); +//#if defined(CONFIG_KERNEL_2_5) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + + inode->i_rdev = old_decode_dev(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; @@ -648,7 +720,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_ dev = obj->myDev; yaffs_GrossLock(dev); - + inode = f->f_dentry->d_inode; if(!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) @@ -688,7 +760,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_ } yaffs_GrossUnlock(dev); - return nWritten != n ? -ENOSPC : nWritten; + return nWritten != n ? -ENOSPC : nWritten; } @@ -773,7 +845,8 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) /* * File creation. Allocate an inode, and we're done.. */ -#if defined(CONFIG_KERNEL_2_5) +//#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) @@ -860,7 +933,8 @@ 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 */ +//#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) @@ -1083,7 +1157,8 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) return error; } -#if defined(CONFIG_KERNEL_2_5) /* Added NCB 185-8-2003 */ +//#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) @@ -1303,7 +1378,8 @@ 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) +//#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); @@ -1394,7 +1470,8 @@ static int yaffs_internal_read_super_mtd(struct super_block * sb, void * data, i #ifdef CONFIG_YAFFS_MTD_ENABLED -#if defined(CONFIG_KERNEL_2_5) +//#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) { @@ -1423,7 +1500,8 @@ static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, FS_REQUIRES_DEV) #ifdef CONFIG_YAFFS_RAM_ENABLED -#if defined(CONFIG_KERNEL_2_5) +//#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) {