X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=c686fd5d5cffc08a108d7a37d97043144abdaccd;hp=99de632bbbc3cccccf8007eb9b6b524e77bd52db;hb=f065aff42ce0dba083767ea3d93824f5e24b162c;hpb=adf8ff155a242969024595f8750f191be6b8acaf

diff --git a/yaffs_fs.c b/yaffs_fs.c
index 99de632..c686fd5 100644
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -32,10 +32,15 @@
  */
 
 const char *yaffs_fs_c_version =
-    "$Id: yaffs_fs.c,v 1.97 2010-03-09 04:12:00 charles Exp $";
+    "$Id: yaffs_fs.c,v 1.100 2010-03-15 06:28:36 charles Exp $";
 extern const char *yaffs_guts_c_version;
 
 #include <linux/version.h>
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
+#define YAFFS_COMPILE_BACKGROUND
+#endif
+
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
 #include <linux/config.h>
 #endif
@@ -52,7 +57,11 @@ extern const char *yaffs_guts_c_version;
 #include <linux/string.h>
 #include <linux/ctype.h>
 
+#ifdef YAFFS_COMPILE_BACKGROUND
 #include <linux/kthread.h>
+#include <linux/delay.h>
+#endif
+
 
 #include "asm/div64.h"
 
@@ -1840,6 +1849,7 @@ static int yaffs_do_sync_fs(struct super_block *sb, int do_checkpoint)
  * The thread should not do any writing while the fs is in read only.
  */
 
+#ifdef YAFFS_COMPILE_BACKGROUND
 static int yaffs_BackgroundThread(void *data)
 {
 	yaffs_Device *dev = (yaffs_Device *)data;
@@ -1892,6 +1902,22 @@ static void yaffs_BackgroundStop(yaffs_Device *dev)
 		ctxt->bgThread = NULL;
 	}
 }
+#else
+static int yaffs_BackgroundThread(void *data)
+{
+	return 0;
+}
+
+static int yaffs_BackgroundStart(yaffs_Device *dev)
+{
+	return 0;
+}
+
+static void yaffs_BackgroundStop(yaffs_Device *dev)
+{
+}
+#endif
+
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static void yaffs_write_super(struct super_block *sb)
@@ -1983,6 +2009,7 @@ static void yaffs_read_inode(struct inode *inode)
 #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)
@@ -2031,8 +2058,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);
@@ -2370,7 +2398,10 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
 	param->noTagsECC = 1;
 #endif
 
+#ifdef CONFIG_YAFFS_DISABLE_BACKGROUND
+#else
 	param->deferDirectoryUpdate = 1;
+#endif
 
 	if(options.tags_ecc_overridden)
 		param->noTagsECC = !options.tags_ecc_on;
@@ -2447,7 +2478,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));
@@ -2599,6 +2632,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)
 {
@@ -2612,6 +2646,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");
 
@@ -2625,32 +2661,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;
 }
@@ -2682,8 +2718,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) {
@@ -2702,12 +2737,36 @@ 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 step = offset;
+	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;
+		
+		buf += sprintf(buf,"%d %u %u\n", n, dev->nFreeChunks, dev->nErasedBlocks * dev->param.nChunksPerBlock);
+	}
+	up(&yaffs_context_lock);
+
+
+	return buf - page < count ? buf - page : count;
+}
+
 /**
  * Set the verbosity of the warnings and error messages.
  *
@@ -2870,7 +2929,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);
@@ -2882,6 +2943,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;