X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=0ee40e7c36bfbd69dbda58e8c8281c22b746fc92;hp=63d31645cfa89e55cb1c3a3fcd622d251356b461;hb=710ded16f463700dde2753ce4a352097051f88f7;hpb=98b2dc79b8bc171a7c07499e247dea296a634fae diff --git a/yaffs_fs.c b/yaffs_fs.c index 63d3164..0ee40e7 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.98 2010-03-10 01:22:19 charles Exp $"; + "$Id: yaffs_fs.c,v 1.102 2010-03-15 23:10:33 charles Exp $"; extern const char *yaffs_guts_c_version; #include @@ -41,6 +41,11 @@ extern const char *yaffs_guts_c_version; #define YAFFS_COMPILE_BACKGROUND #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) +#define YAFFS_COMPILE_EXPORTFS +#endif + + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) #include #endif @@ -57,6 +62,10 @@ extern const char *yaffs_guts_c_version; #include #include +#ifdef YAFFS_COMPILE_EXPORTFS +#include +#endif + #ifdef YAFFS_COMPILE_BACKGROUND #include #include @@ -138,16 +147,19 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS; unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS; unsigned int yaffs_auto_checkpoint = 1; +unsigned int yaffs_gc_control = 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); +module_param(yaffs_gc_control, uint, 0644); #else MODULE_PARM(yaffs_traceMask, "i"); MODULE_PARM(yaffs_wr_attempts, "i"); MODULE_PARM(yaffs_auto_checkpoint, "i"); +MODULE_PARM(yaffs_gc_control, "i"); #endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) @@ -283,6 +295,7 @@ static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); #else static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); #endif +static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin); static struct address_space_operations yaffs_file_address_operations = { .readpage = yaffs_readpage, @@ -375,6 +388,7 @@ static const struct file_operations yaffs_dir_operations = { .read = generic_read_dir, .readdir = yaffs_readdir, .fsync = yaffs_sync_object, + .llseek = yaffs_dir_llseek, }; static const struct super_operations yaffs_super_ops = { @@ -392,6 +406,11 @@ static const struct super_operations yaffs_super_ops = { .sync_fs = yaffs_sync_fs, .write_super = yaffs_write_super, }; + +static unsigned yaffs_gc_control_callback(yaffs_Device *dev) +{ + return yaffs_gc_control; +} static void yaffs_GrossLock(yaffs_Device *dev) { @@ -406,6 +425,71 @@ static void yaffs_GrossUnlock(yaffs_Device *dev) up(&(yaffs_DeviceToContext(dev)->grossLock)); } +#ifdef YAFFS_COMPILE_EXPORTFS + +static struct inode * +yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino, uint32_t generation) +{ + return Y_IGET(sb, ino); +} + +static struct dentry * +yaffs2_fh_to_dentry(struct super_block *sb, struct fid *fid, int fh_len, int fh_type) +{ + return generic_fh_to_dentry(sb, fid, fh_len, fh_type, yaffs2_nfs_get_inode) ; +} + +static struct dentry * + yaffs2_fh_to_parent(struct super_block *sb, struct fid *fid, int fh_len, int fh_type) +{ + return generic_fh_to_parent(sb, fid, fh_len, fh_type, yaffs2_nfs_get_inode); +} + +struct dentry *yaffs2_get_parent(struct dentry *dentry) +{ + + struct super_block *sb = dentry->d_inode->i_sb; + struct dentry *parent = ERR_PTR(-ENOENT); + struct inode *inode; + unsigned long parent_ino; + yaffs_Object *d_obj; + yaffs_Object *parent_obj; + + d_obj = yaffs_InodeToObject(dentry->d_inode); + + if (d_obj) { + parent_obj = d_obj->parent; + if (parent_obj) { + parent_ino = yaffs_GetObjectInode(parent_obj); + inode = Y_IGET(sb, parent_ino); + + if (IS_ERR(inode)) { + parent = ERR_CAST(inode); + } else { + parent = d_obtain_alias(inode); + if (!IS_ERR(parent)) { + parent = ERR_PTR(-ENOMEM); + iput(inode); + } + } + } + } + + return parent; +} + +/* Just declare a zero structure as a NULL value implies + * using the default functions of expfs. + */ + +static struct export_operations yaffs_export_ops = +{ + .fh_to_dentry = yaffs2_fh_to_dentry, + .fh_to_parent = yaffs2_fh_to_parent, + .get_parent = yaffs2_get_parent, +} ; + +#endif /*-----------------------------------------------------------------*/ /* Directory search context allows us to unlock access to yaffs during @@ -594,7 +678,8 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) yaffs_Device *dev = yaffs_InodeToObject(dir)->myDev; - yaffs_GrossLock(dev); + if(current != yaffs_DeviceToContext(dev)->readdirProcess) + yaffs_GrossLock(dev); T(YAFFS_TRACE_OS, ("yaffs_lookup for %d:%s\n", @@ -606,7 +691,8 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) obj = yaffs_GetEquivalentObject(obj); /* in case it was a hardlink */ /* Can't hold gross lock when calling yaffs_get_inode() */ - yaffs_GrossUnlock(dev); + if(current != yaffs_DeviceToContext(dev)->readdirProcess) + yaffs_GrossUnlock(dev); if (obj) { T(YAFFS_TRACE_OS, @@ -1279,6 +1365,33 @@ static void yaffs_release_space(struct file *f) yaffs_GrossUnlock(dev); } + +static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin) +{ + long long retval; + + lock_kernel(); + + switch (origin){ + case 2: + offset += i_size_read(file->f_path.dentry->d_inode); + break; + case 1: + offset += file->f_pos; + } + retval = -EINVAL; + + if (offset >= 0){ + if (offset != file->f_pos) + file->f_pos = offset; + + retval = offset; + } + unlock_kernel(); + return retval; +} + + static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) { yaffs_Object *obj; @@ -1296,6 +1409,8 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) yaffs_GrossLock(dev); + yaffs_DeviceToContext(dev)->readdirProcess = current; + offset = f->f_pos; sc = yaffs_NewSearch(obj); @@ -1334,7 +1449,6 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) /* If the directory has changed since the open or last call to readdir, rewind to after the 2 canned entries. */ - if (f->f_version != inode->i_version) { offset = 2; f->f_pos = offset; @@ -1373,6 +1487,8 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) } unlock_out: + yaffs_DeviceToContext(dev)->readdirProcess = NULL; + yaffs_GrossUnlock(dev); out: yaffs_EndSearch(sc); @@ -1380,6 +1496,8 @@ out: return retVal; } + + /* * File creation. Allocate an inode, and we're done.. */ @@ -1470,6 +1588,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, ("yaffs_mknod created object %d count = %d\n", obj->objectId, atomic_read(&inode->i_count))); error = 0; + yaffs_FillInodeFromObject(dir,parent); } else { T(YAFFS_TRACE_OS, ("yaffs_mknod failed making object\n")); @@ -1503,16 +1622,17 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry) int retVal; yaffs_Device *dev; + yaffs_Object *obj; T(YAFFS_TRACE_OS, ("yaffs_unlink %d:%s\n", (int)(dir->i_ino), dentry->d_name.name)); - - dev = yaffs_InodeToObject(dir)->myDev; + obj = yaffs_InodeToObject(dir); + dev = obj->myDev; yaffs_GrossLock(dev); - retVal = yaffs_Unlink(yaffs_InodeToObject(dir), dentry->d_name.name); + retVal = yaffs_Unlink(obj, dentry->d_name.name); if (retVal == YAFFS_OK) { dentry->d_inode->i_nlink--; @@ -1822,17 +1942,23 @@ static int yaffs_do_sync_fs(struct super_block *sb, int do_checkpoint) { yaffs_Device *dev = yaffs_SuperToDevice(sb); + unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4); + T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, - ("yaffs_do_sync_fs: %s %s\n", + ("yaffs_do_sync_fs: %s %s%s\n", sb->s_dirt ? "dirty" : "clean", - do_checkpoint ? "with checkpoint" : "no checkpoint")); + do_checkpoint ? "with checkpoint" : "no checkpoint", + oneshot_checkpoint ? " one-shot" : "" )); - if (sb->s_dirt) { + if (sb->s_dirt || oneshot_checkpoint) { yaffs_GrossLock(dev); yaffs_FlushSuperBlock(sb,do_checkpoint); yaffs_GrossUnlock(dev); sb->s_dirt = 0; + + if(oneshot_checkpoint) + yaffs_auto_checkpoint &= ~4; } return 0; } @@ -1997,18 +2123,21 @@ static void yaffs_read_inode(struct inode *inode) T(YAFFS_TRACE_OS, ("yaffs_read_inode for %d\n", (int)inode->i_ino)); - yaffs_GrossLock(dev); + if(current != yaffs_DeviceToContext(dev)->readdirProcess) + yaffs_GrossLock(dev); obj = yaffs_FindObjectByNumber(dev, inode->i_ino); yaffs_FillInodeFromObject(inode, obj); - yaffs_GrossUnlock(dev); + if(current != yaffs_DeviceToContext(dev)->readdirProcess) + yaffs_GrossUnlock(dev); } #endif static YLIST_HEAD(yaffs_context_list); +struct semaphore yaffs_context_lock; #if 0 /* not used */ static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data) @@ -2057,8 +2186,9 @@ static void yaffs_put_super(struct super_block *sb) yaffs_GrossUnlock(dev); - /* we assume this is protected by lock_kernel() in mount/umount */ + down(&yaffs_context_lock); ylist_del_init(&(yaffs_DeviceToContext(dev)->contextList)); + up(&yaffs_context_lock); if (yaffs_DeviceToContext(dev)->spareBuffer) { YFREE(yaffs_DeviceToContext(dev)->spareBuffer); @@ -2186,6 +2316,10 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, sb->s_op = &yaffs_super_ops; sb->s_flags |= MS_NOATIME; +#ifdef YAFFS_COMPILE_EXPORTFS + sb->s_export_op = &yaffs_export_ops; +#endif + if (!sb) printk(KERN_INFO "yaffs: sb is NULL\n"); else if (!sb->s_dev) @@ -2460,6 +2594,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, yaffs_DeviceToContext(dev)->putSuperFunc = yaffs_MTDPutSuper; param->markSuperBlockDirty = yaffs_MarkSuperBlockDirty; + param->gcControl = yaffs_gc_control_callback; yaffs_DeviceToContext(dev)->superBlock= sb; @@ -2476,7 +2611,9 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, param->skipCheckpointWrite = options.skip_checkpoint_write; /* we assume this is protected by lock_kernel() in mount/umount */ + down(&yaffs_context_lock); ylist_add_tail(&(yaffs_DeviceToContext(dev)->contextList), &yaffs_context_list); + up(&yaffs_context_lock); /* Directory search handling...*/ YINIT_LIST_HEAD(&(yaffs_DeviceToContext(dev)->searchContexts)); @@ -2628,6 +2765,7 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, #endif /* CONFIG_YAFFS_YAFFS2 */ static struct proc_dir_entry *my_proc_entry; +static struct proc_dir_entry *debug_proc_entry; static char *yaffs_dump_dev_part0(char *buf, yaffs_Device * dev) { @@ -2641,6 +2779,8 @@ static char *yaffs_dump_dev_part0(char *buf, yaffs_Device * dev) buf += sprintf(buf, "emptyLostAndFound.. %d\n", dev->param.emptyLostAndFound); buf += sprintf(buf, "disableLazyLoad.... %d\n", dev->param.disableLazyLoad); buf += sprintf(buf, "refreshPeriod...... %d\n", dev->param.refreshPeriod); + buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->param.nShortOpCaches); + buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->param.nReservedBlocks); buf += sprintf(buf, "\n"); @@ -2654,32 +2794,32 @@ static char *yaffs_dump_dev_part1(char *buf, yaffs_Device * dev) 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, "nReservedBlocks.... %d\n", dev->param.nReservedBlocks); buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint); + buf += sprintf(buf, "\n"); 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, "nShortOpCaches..... %d\n", dev->param.nShortOpCaches); - 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, "refreshCount....... %d\n", dev->refreshCount); + buf += sprintf(buf, "\n"); + buf += sprintf(buf, "nPageWrites........ %u\n", dev->nPageWrites); + buf += sprintf(buf, "nPageReads......... %u\n", dev->nPageReads); + buf += sprintf(buf, "nBlockErasures..... %u\n", dev->nBlockErasures); + buf += sprintf(buf, "nGCCopies.......... %u\n", dev->nGCCopies); + buf += sprintf(buf, "garbageCollections. %u\n", dev->garbageCollections); + buf += sprintf(buf, "passiveGCs......... %u\n", dev->passiveGarbageCollections); + buf += sprintf(buf, "nRetriedWrites..... %u\n", dev->nRetriedWrites); + buf += sprintf(buf, "nRetireBlocks...... %u\n", dev->nRetiredBlocks); + buf += sprintf(buf, "eccFixed........... %u\n", dev->eccFixed); + buf += sprintf(buf, "eccUnfixed......... %u\n", dev->eccUnfixed); + buf += sprintf(buf, "tagsEccFixed....... %u\n", dev->tagsEccFixed); + buf += sprintf(buf, "tagsEccUnfixed..... %u\n", dev->tagsEccUnfixed); + buf += sprintf(buf, "cacheHits.......... %u\n", dev->cacheHits); + buf += sprintf(buf, "nDeletedFiles...... %u\n", dev->nDeletedFiles); + buf += sprintf(buf, "nUnlinkedFiles..... %u\n", dev->nUnlinkedFiles); + buf += sprintf(buf, "refreshCount....... %u\n", dev->refreshCount); buf += - sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions); + sprintf(buf, "nBackgroudDeletions %u\n", dev->nBackgroundDeletions); return buf; } @@ -2711,8 +2851,7 @@ static int yaffs_proc_read(char *page, else { step-=2; - /* hold lock_kernel while traversing yaffs_dev_list */ - lock_kernel(); + down(&yaffs_context_lock); /* Locate and print the Nth entry. Order N-squared but N is small. */ ylist_for_each(item, &yaffs_context_list) { @@ -2731,8 +2870,42 @@ static int yaffs_proc_read(char *page, break; } - unlock_kernel(); + up(&yaffs_context_lock); + } + + return buf - page < count ? buf - page : count; +} + +static int yaffs_debug_proc_read(char *page, + char **start, + off_t offset, int count, int *eof, void *data) +{ + struct ylist_head *item; + char *buf = page; + int n = 0; + + down(&yaffs_context_lock); + + /* Locate and print the Nth entry. Order N-squared but N is small. */ + ylist_for_each(item, &yaffs_context_list) { + struct yaffs_LinuxContext *dc = ylist_entry(item, struct yaffs_LinuxContext, contextList); + yaffs_Device *dev = dc->dev; + + int erasedChunks; + int nObjects; + int nTnodes; + + erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock; + nObjects = dev->nObjectsCreated -dev->nFreeObjects; + nTnodes = dev->nTnodesCreated - dev->nFreeTnodes; + + + buf += sprintf(buf,"%d, %d, %d, %d, %d\n", + n, dev->nFreeChunks, erasedChunks, + nObjects, nTnodes); } + up(&yaffs_context_lock); + return buf - page < count ? buf - page : count; } @@ -2899,7 +3072,9 @@ static int __init init_yaffs_fs(void) T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__ " Installing. \n")); - /* Install the proc_fs entry */ + init_MUTEX(&yaffs_context_lock); + + /* Install the proc_fs entries */ my_proc_entry = create_proc_entry("yaffs", S_IRUGO | S_IFREG, YPROC_ROOT); @@ -2911,6 +3086,17 @@ static int __init init_yaffs_fs(void) } else return -ENOMEM; + debug_proc_entry = create_proc_entry("yaffs_debug", + S_IRUGO | S_IFREG, + YPROC_ROOT); + + if (debug_proc_entry) { + debug_proc_entry->write_proc = NULL; + debug_proc_entry->read_proc = yaffs_debug_proc_read; + debug_proc_entry->data = NULL; + } else + return -ENOMEM; + /* Now add the file system entries */ fsinst = fs_to_install;