X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=yaffs_fs.c;h=65efd7b42442e71a2c1b3e861c277a8d90891e96;hb=3e99d0b5c96855096922aaeeca0bffaec15e457c;hp=b8f2575e7e52a77e702969b986626e58d144ab4f;hpb=92ee023b9d7144e178a050eff898aaae4415096b;p=yaffs2.git diff --git a/yaffs_fs.c b/yaffs_fs.c index b8f2575..65efd7b 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -32,7 +32,7 @@ */ const char *yaffs_fs_c_version = - "$Id: yaffs_fs.c,v 1.67 2008-07-03 20:06:05 charles Exp $"; + "$Id: yaffs_fs.c,v 1.73 2009-03-01 23:52:28 charles Exp $"; extern const char *yaffs_guts_c_version; #include @@ -77,6 +77,12 @@ extern const char *yaffs_guts_c_version; #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) +#define YPROC_ROOT &proc_root +#else +#define YPROC_ROOT NULL +#endif + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)) #define WRITE_SIZE_STR "writesize" #define WRITE_SIZE(mtd) (mtd)->writesize @@ -85,6 +91,23 @@ extern const char *yaffs_guts_c_version; #define WRITE_SIZE(mtd) (mtd)->oobblock #endif +#if(LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) +#define YAFFS_USE_WRITE_BEGIN_END 1 +#else +#define YAFFS_USE_WRITE_BEGIN_END 0 +#endif + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)) +static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) +{ + uint64_t result = partition_size; + do_div(result,block_size); + return (uint32_t)result; +} +#else +#define YCALCBLOCKS(s,b) ((s)/(b)) +#endif + #include #include "yportenv.h" @@ -97,14 +120,17 @@ extern const char *yaffs_guts_c_version; unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS; unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS; +unsigned int yaffs_auto_checkpoint = 1; /* Module Parameters */ #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) module_param(yaffs_traceMask,uint,0644); module_param(yaffs_wr_attempts,uint,0644); +module_param(yaffs_auto_checkpoint,uint,0644); #else MODULE_PARM(yaffs_traceMask,"i"); MODULE_PARM(yaffs_wr_attempts,"i"); +MODULE_PARM(yaffs_auto_checkpoint,"i"); #endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) @@ -141,6 +167,8 @@ static void yaffs_put_super(struct super_block *sb); static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_t * pos); +static ssize_t yaffs_hold_space(struct file *f); +static void yaffs_release_space(struct file *f); #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)) static int yaffs_file_flush(struct file *file, fl_owner_t id); @@ -196,7 +224,10 @@ static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf); static int yaffs_statfs(struct super_block *sb, struct statfs *buf); #endif +#ifdef YAFFS_HAS_PUT_INODE static void yaffs_put_inode(struct inode *inode); +#endif + static void yaffs_delete_inode(struct inode *); static void yaffs_clear_inode(struct inode *); @@ -206,10 +237,22 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc); #else static int yaffs_writepage(struct page *page); #endif + + +#if (YAFFS_USE_WRITE_BEGIN_END != 0) +static int yaffs_write_begin(struct file *filp, struct address_space *mapping, + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata); +static int yaffs_write_end(struct file *filp, struct address_space *mapping, + loff_t pos, unsigned len, unsigned copied, + struct page *pg, void *fsdadata); +#else 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); + +#endif static int yaffs_readlink(struct dentry *dentry, char __user * buffer, int buflen); @@ -222,8 +265,13 @@ 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, +#if (YAFFS_USE_WRITE_BEGIN_END > 0) + .write_begin = yaffs_write_begin, + .write_end = yaffs_write_end, +#else .prepare_write = yaffs_prepare_write, .commit_write = yaffs_commit_write, +#endif }; #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22)) @@ -237,6 +285,7 @@ static struct file_operations yaffs_file_operations = { .fsync = yaffs_sync_object, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, + .llseek = generic_file_llseek, }; #elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)) @@ -301,7 +350,9 @@ static struct super_operations yaffs_super_ops = { #ifndef YAFFS_USE_OWN_IGET .read_inode = yaffs_read_inode, #endif +#ifdef YAFFS_HAS_PUT_INODE .put_inode = yaffs_put_inode, +#endif .put_super = yaffs_put_super, .delete_inode = yaffs_delete_inode, .clear_inode = yaffs_clear_inode, @@ -311,14 +362,16 @@ static struct super_operations yaffs_super_ops = { static void yaffs_GrossLock(yaffs_Device * dev) { - T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n")); + T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking %p\n",current)); down(&dev->grossLock); + T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locked %p\n",current)); + } static void yaffs_GrossUnlock(yaffs_Device * dev) { - T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n")); + T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking %p\n",current)); up(&dev->grossLock); } @@ -445,6 +498,9 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) } + +#ifdef YAFFS_HAS_PUT_INODE + /* For now put inode is just for debugging * Put inode is called when the inode **structure** is put. */ @@ -455,6 +511,7 @@ static void yaffs_put_inode(struct inode *inode) atomic_read(&inode->i_count))); } +#endif /* clear is called to tell the fs to release any per-inode data it holds */ static void yaffs_clear_inode(struct inode *inode) @@ -683,6 +740,69 @@ static int yaffs_writepage(struct page *page) return (nWritten == nBytes) ? 0 : -ENOSPC; } + +#if (YAFFS_USE_WRITE_BEGIN_END > 0) +static int yaffs_write_begin(struct file *filp, struct address_space *mapping, + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata) + +{ + struct page *pg = NULL; + pgoff_t index = pos >> PAGE_CACHE_SHIFT; + uint32_t offset = pos & (PAGE_CACHE_SIZE - 1); + uint32_t to = offset + len; + + int ret = 0; + int space_held = 0; + + T(YAFFS_TRACE_OS, (KERN_DEBUG "start yaffs_write_begin\n")); + /* Get a page */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28) + pg = grab_cache_page_write_begin(mapping,index,flags); +#else + pg = __grab_cache_page(mapping,index); +#endif + + *pagep = pg; + if(!pg){ + ret = -ENOMEM; + goto out; + } + /* Get fs space */ + space_held = yaffs_hold_space(filp); + + if(!space_held){ + ret = -ENOSPC; + goto out; + } + + /* Update page if required */ + + if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE)) + ret = yaffs_readpage_nolock(filp, pg); + + if(ret) + goto out; + + /* Happy path return */ + T(YAFFS_TRACE_OS, (KERN_DEBUG "end yaffs_write_begin - ok\n")); + + return 0; + +out: + T(YAFFS_TRACE_OS, (KERN_DEBUG "end yaffs_write_begin fail returning %d\n",ret)); + if(space_held){ + yaffs_release_space(filp); + } + if(pg) { + unlock_page(pg); + page_cache_release(pg); + } + return ret; +} + +#else + static int yaffs_prepare_write(struct file *f, struct page *pg, unsigned offset, unsigned to) { @@ -690,22 +810,68 @@ static int yaffs_prepare_write(struct file *f, struct page *pg, 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); - return 0; } +#endif + +#if (YAFFS_USE_WRITE_BEGIN_END > 0) +static int yaffs_write_end(struct file *filp, struct address_space *mapping, + loff_t pos, unsigned len, unsigned copied, + struct page *pg, void *fsdadata) +{ + int ret = 0; + void *addr, *kva; + uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE -1); + + + + kva=kmap(pg); + addr = kva + offset_into_page; + + T(YAFFS_TRACE_OS, + (KERN_DEBUG "yaffs_write_end addr %x pos %x nBytes %d\n", (unsigned) addr, + (int)pos, copied)); + + ret = yaffs_file_write(filp, addr, copied, &pos); + + if (ret != copied) { + T(YAFFS_TRACE_OS, + (KERN_DEBUG + "yaffs_write_end not same size ret %d copied %d\n", + ret, copied )); + SetPageError(pg); + ClearPageUptodate(pg); + } else { + SetPageUptodate(pg); + } + + kunmap(pg); + + yaffs_release_space(filp); + unlock_page(pg); + page_cache_release(pg); + return ret; +} +#else static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, unsigned to) { - void *addr = page_address(pg) + offset; + void *addr, *kva; + loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset; int nBytes = to - offset; int nWritten; unsigned spos = pos; - unsigned saddr = (unsigned)addr; + unsigned saddr; + + kva=kmap(pg); + addr = kva + offset; + + saddr = (unsigned) addr; T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr, @@ -724,6 +890,8 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, SetPageUptodate(pg); } + kunmap(pg); + T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_commit_write returning %d\n", nWritten == nBytes ? 0 : nWritten)); @@ -731,6 +899,8 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, return nWritten == nBytes ? 0 : nWritten; } +#endif + static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj) { @@ -901,7 +1071,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, } else { T(YAFFS_TRACE_OS, (KERN_DEBUG - "yaffs_file_write about to write writing %d bytes" + "yaffs_file_write about to write writing %zu bytes" "to object %d at %d\n", n, obj->objectId, ipos)); } @@ -909,7 +1079,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0); T(YAFFS_TRACE_OS, - (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n", + (KERN_DEBUG "yaffs_file_write writing %zu bytes, %d written at %d\n", n, nWritten, ipos)); if (nWritten > 0) { ipos += nWritten; @@ -930,6 +1100,48 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, return nWritten == 0 ? -ENOSPC : nWritten; } +/* Space holding and freeing is done to ensure we have space available for write_begin/end */ +/* For now we just assume few parallel writes and check against a small number. */ +/* Todo: need to do this with a counter to handle parallel reads better */ + +static ssize_t yaffs_hold_space(struct file *f) +{ + yaffs_Object *obj; + yaffs_Device *dev; + + int nFreeChunks; + + + obj = yaffs_DentryToObject(f->f_dentry); + + dev = obj->myDev; + + yaffs_GrossLock(dev); + + nFreeChunks = yaffs_GetNumberOfFreeChunks(dev); + + yaffs_GrossUnlock(dev); + + return (nFreeChunks > 20) ? 1 : 0; +} + +static void yaffs_release_space(struct file *f) +{ + yaffs_Object *obj; + yaffs_Device *dev; + + + obj = yaffs_DentryToObject(f->f_dentry); + + dev = obj->myDev; + + yaffs_GrossLock(dev); + + + yaffs_GrossUnlock(dev); + +} + static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) { yaffs_Object *obj; @@ -1022,6 +1234,13 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) /* * File creation. Allocate an inode, and we're done.. */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) +#define YCRED(x) x +#else +#define YCRED(x) x->cred +#endif + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev) @@ -1038,8 +1257,8 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, yaffs_Object *parent = yaffs_InodeToObject(dir); int error = -ENOSPC; - uid_t uid = current->fsuid; - gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid; + uid_t uid = YCRED(current)->fsuid; + gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; if((dir->i_mode & S_ISGID) && S_ISDIR(mode)) mode |= S_ISGID; @@ -1091,7 +1310,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, uid, gid); break; case S_IFLNK: /* symlink */ - T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n")); + T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making symlink\n")); obj = NULL; /* Do we ever get here? */ break; } @@ -1218,8 +1437,8 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, { yaffs_Object *obj; yaffs_Device *dev; - uid_t uid = current->fsuid; - gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid; + uid_t uid = YCRED(current)->fsuid; + gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n")); @@ -1450,7 +1669,8 @@ static int yaffs_write_super(struct super_block *sb) { T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n")); - yaffs_do_sync_fs(sb); + if (yaffs_auto_checkpoint >= 2) + yaffs_do_sync_fs(sb); #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)) return 0; #endif @@ -1466,7 +1686,8 @@ static int yaffs_sync_fs(struct super_block *sb) T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n")); - yaffs_do_sync_fs(sb); + if (yaffs_auto_checkpoint >= 1) + yaffs_do_sync_fs(sb); return 0; @@ -1615,8 +1836,8 @@ static void yaffs_MarkSuperBlockDirty(void *vsb) struct super_block *sb = (struct super_block *)vsb; T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb)); -// if(sb) -// sb->s_dirt = 1; + if(sb) + sb->s_dirt = 1; } typedef struct { @@ -1757,7 +1978,11 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd))); T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize)); T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize)); - T(YAFFS_TRACE_OS, (" size %d\n", mtd->size)); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) + T(YAFFS_TRACE_OS, (" size %u\n", mtd->size)); +#else + T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size)); +#endif #ifdef CONFIG_YAFFS_AUTO_YAFFS2 @@ -1854,7 +2079,8 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, /* Set up the memory size parameters.... */ - nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK); + nBlocks = YCALCBLOCKS(mtd->size ,(YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK)); + dev->startBlock = 0; dev->endBlock = nBlocks - 1; dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK; @@ -1880,7 +2106,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, dev->totalBytesPerChunk = mtd->oobblock; dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock; #endif - nBlocks = mtd->size / mtd->erasesize; + nBlocks = YCALCBLOCKS(mtd->size,mtd->erasesize); dev->startBlock = 0; dev->endBlock = nBlocks - 1; @@ -1958,6 +2184,9 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, return NULL; } sb->s_root = root; + sb->s_dirt = !dev->isCheckpointed; + T(YAFFS_TRACE_ALWAYS, + ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed)); T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n")); return sb; @@ -2304,7 +2533,7 @@ static int __init init_yaffs_fs(void) /* Install the proc_fs entry */ my_proc_entry = create_proc_entry("yaffs", S_IRUGO | S_IFREG, - &proc_root); + YPROC_ROOT); if (my_proc_entry) { my_proc_entry->write_proc = yaffs_proc_write; @@ -2350,7 +2579,7 @@ static void __exit exit_yaffs_fs(void) T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__ " removing. \n")); - remove_proc_entry("yaffs", &proc_root); + remove_proc_entry("yaffs", YPROC_ROOT); fsinst = fs_to_install;