X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=e4ea466b54365b4512502743c4437d36d2c098b5;hp=56cd12f2b4f4167e320754062c319ab01c814952;hb=68f0159122cfb94e6912dd99d6398ba72e578a72;hpb=71735099f6e4f4eb6037852a0590223224f22382

diff --git a/yaffs_fs.c b/yaffs_fs.c
index 56cd12f..e4ea466 100644
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -30,7 +30,7 @@
  */
 
 
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.24 2005-08-01 20:54:45 luc Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.28 2005-08-09 03:52:23 charles Exp $";
 extern const char *yaffs_guts_c_version;
 
 
@@ -488,6 +488,7 @@ static int yaffs_writepage(struct page *page)
 #endif
 {
 	struct address_space *mapping = page->mapping;
+	loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT;
 	struct inode *inode;
 	unsigned long end_index;
 	char *buffer;
@@ -501,6 +502,14 @@ static int yaffs_writepage(struct page *page)
 	if (!inode)
 		BUG();
 
+	if (offset > inode->i_size)
+	{
+		T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_writepage at %08x, inode size = %08x!!!\n", (unsigned)(page->index << PAGE_CACHE_SHIFT), (unsigned) inode->i_size));
+		T(YAFFS_TRACE_OS,(KERN_DEBUG"                -> don't care!!\n"));
+		unlock_page(page);
+		return 0;
+	}
+
 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
 
 	/* easy case */
@@ -525,9 +534,13 @@ static int yaffs_writepage(struct page *page)
 	obj = yaffs_InodeToObject(inode);
 	yaffs_GrossLock(obj->myDev);
 
+	T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_writepage at %08x, size %08x\n", (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
+	T(YAFFS_TRACE_OS,(KERN_DEBUG"writepag0: obj = %05x, ino = %05x\n", (int) obj->variant.fileVariant.fileSize, (int) inode->i_size));
 
 	nWritten = yaffs_WriteDataToFile(obj,buffer,page->index << PAGE_CACHE_SHIFT,nBytes,0);
 
+	T(YAFFS_TRACE_OS,(KERN_DEBUG"writepag1: obj = %05x, ino = %05x\n", (int) obj->variant.fileVariant.fileSize, (int) inode->i_size));
+
 	yaffs_GrossUnlock(obj->myDev);
 	
 	kunmap(page);
@@ -1082,10 +1095,8 @@ static int yaffs_rename(struct inode * old_dir, struct dentry *old_dentry, struc
 	else
 	{
 	   
-		// Unlink the target if it exists
-		removed = yaffs_Unlink(yaffs_InodeToObject(new_dir),new_dentry->d_name.name);
-
-	
+	        // Now does unlinking internally using shadowing mechanism
+	        
 		retVal =  yaffs_RenameObject(yaffs_InodeToObject(old_dir),old_dentry->d_name.name,
 									yaffs_InodeToObject(new_dir),new_dentry->d_name.name);
 									
@@ -1241,6 +1252,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, struct su
 	struct dentry * root;
 	yaffs_Device *dev = 0;
 	char devname_buf[BDEVNAME_SIZE+1];
+	struct mtd_info *mtd;
 	int err;
 	
 	sb->s_magic = YAFFS_MAGIC;
@@ -1267,155 +1279,150 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion, struct su
 #endif
 
 
+	T(YAFFS_TRACE_ALWAYS,("yaffs: Attempting MTD mount on %u.%u, \"%s\"\n",
+	 MAJOR(sb->s_dev),MINOR(sb->s_dev), yaffs_devname(sb, devname_buf)));
+		
+	// Check it's an mtd device.....
+	if(MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
+	{
+		return NULL; // This isn't an mtd device
+	} 
 	
+	// Get the device
+	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
+	if (!mtd) 
 	{
-		struct mtd_info *mtd;
-		
-		T(YAFFS_TRACE_ALWAYS,("yaffs: Attempting MTD mount on %u.%u, \"%s\"\n",
-		 MAJOR(sb->s_dev),MINOR(sb->s_dev), yaffs_devname(sb, devname_buf)));
-			
-		// Check it's an mtd device.....
-		if(MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
-		{
-			return NULL; // This isn't an mtd device
-		} 
-		
-		// Get the device
-		mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
-		if (!mtd) 
+		T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device #%u doesn't appear to exist\n", MINOR(sb->s_dev)));
+		return NULL;
+	}
+	
+	// Check it's NAND
+	if(mtd->type != MTD_NANDFLASH)
+	{
+		T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device is not NAND it's type %d\n", mtd->type));
+		return NULL;
+	}
+
+	T(YAFFS_TRACE_OS,(" erase %p\n",mtd->erase));
+	T(YAFFS_TRACE_OS,(" read %p\n",mtd->read));
+	T(YAFFS_TRACE_OS,(" write %p\n",mtd->write));
+	T(YAFFS_TRACE_OS,(" readoob %p\n",mtd->read_oob));
+	T(YAFFS_TRACE_OS,(" writeoob %p\n",mtd->write_oob));
+	T(YAFFS_TRACE_OS,(" block_isbad %p\n",mtd->block_isbad));
+	T(YAFFS_TRACE_OS,(" block_markbad %p\n",mtd->block_markbad));
+	T(YAFFS_TRACE_OS,(" oobblock %d\n",mtd->oobblock));
+	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(yaffsVersion == 2)
+	{
+		// Check for version 2 style functions
+		if(!mtd->erase ||
+		   !mtd->block_isbad ||
+		   !mtd->block_markbad ||
+		   !mtd->read  ||
+		   !mtd->write ||
+		   !mtd->write_ecc ||
+		   !mtd->read_ecc ||
+		   !mtd->read_oob ||
+		   !mtd->write_oob )
 		{
-			T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device #%u doesn't appear to exist\n", MINOR(sb->s_dev)));
+			T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device does not support required functions\n"));;
 			return NULL;
 		}
-		
-		// Check it's NAND
-		if(mtd->type != MTD_NANDFLASH)
+	
+		if(mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+		   mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE)
 		{
-			T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device is not NAND it's type %d\n", mtd->type));
+			T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device does not support have the right page sizes\n"));
 			return NULL;
-		}
-
-		T(YAFFS_TRACE_OS,(" erase %p\n",mtd->erase));
-		T(YAFFS_TRACE_OS,(" read %p\n",mtd->read));
-		T(YAFFS_TRACE_OS,(" write %p\n",mtd->write));
-		T(YAFFS_TRACE_OS,(" readoob %p\n",mtd->read_oob));
-		T(YAFFS_TRACE_OS,(" writeoob %p\n",mtd->write_oob));
-		T(YAFFS_TRACE_OS,(" block_isbad %p\n",mtd->block_isbad));
-		T(YAFFS_TRACE_OS,(" block_markbad %p\n",mtd->block_markbad));
-		T(YAFFS_TRACE_OS,(" oobblock %d\n",mtd->oobblock));
-		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(yaffsVersion == 2)
+		}		}
+	else
+	{
+		// Check for V1 style functions
+		if(!mtd->erase ||
+		   !mtd->read  ||
+		   !mtd->write ||
+		   !mtd->write_ecc ||
+		   !mtd->read_ecc ||
+		   !mtd->read_oob ||
+		   !mtd->write_oob )
 		{
-			// Check for version 2 style functions
-			if(!mtd->erase ||
-			   !mtd->block_isbad ||
-			   !mtd->block_markbad ||
-			   !mtd->read  ||
-			   !mtd->write ||
-			   !mtd->write_ecc ||
-			   !mtd->read_ecc ||
-			   !mtd->read_oob ||
-			   !mtd->write_oob )
-			{
-				T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device does not support required functions\n"));;
-				return NULL;
-			}
-		
-			if(mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-			   mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE)
-			{
-				T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device does not support have the right page sizes\n"));
-				return NULL;
-			}		}
-		else
+			T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device does not support required functions\n"));;
+			return NULL;
+		}
+	
+		if(mtd->oobblock != YAFFS_BYTES_PER_CHUNK ||
+		   mtd->oobsize != YAFFS_BYTES_PER_SPARE)
 		{
-			// Check for V1 style functions
-			if(!mtd->erase ||
-			   !mtd->read  ||
-			   !mtd->write ||
-			   !mtd->write_ecc ||
-			   !mtd->read_ecc ||
-			   !mtd->read_oob ||
-			   !mtd->write_oob )
-			{
-				T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device does not support required functions\n"));;
-				return NULL;
-			}
-		
-			if(mtd->oobblock != YAFFS_BYTES_PER_CHUNK ||
-			   mtd->oobsize != YAFFS_BYTES_PER_SPARE)
-			{
-				T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device does not support have the right page sizes\n"));
-				return NULL;
-			}
+			T(YAFFS_TRACE_ALWAYS,("yaffs: MTD device does not support have the right page sizes\n"));
+			return NULL;
 		}
-		   
+	}
+	   
 
-			// OK, so if we got here, we have an MTD that's NAND and looks 
-			// like it has the right capabilities
-			// Set the yaffs_Device up for mtd
+		// OK, so if we got here, we have an MTD that's NAND and looks 
+		// like it has the right capabilities
+		// Set the yaffs_Device up for mtd
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-		sb->s_fs_info =	dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL);
+	sb->s_fs_info =	dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL);
 #else
-		sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL);
+	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device),GFP_KERNEL);
 #endif
-		if(!dev)
-		{
-			// Deep shit could not allocate device structure
-			T(YAFFS_TRACE_ALWAYS,("yaffs_read_super: Failed trying to allocate yaffs_Device. \n"));
-			return NULL;
-		}
+	if(!dev)
+	{
+		// Deep shit could not allocate device structure
+		T(YAFFS_TRACE_ALWAYS,("yaffs_read_super: Failed trying to allocate yaffs_Device. \n"));
+		return NULL;
+	}
 
-		memset(dev,0,sizeof(yaffs_Device));
-		dev->genericDevice = mtd; 
-		dev->name = mtd->name;
+	memset(dev,0,sizeof(yaffs_Device));
+	dev->genericDevice = mtd; 
+	dev->name = mtd->name;
 
-		// Set up the memory size parameters....
-		
-		nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
+	// Set up the memory size parameters....
+	
+	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
+	dev->startBlock = 0;
+	dev->endBlock = nBlocks - 1;
+	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
+	dev->nBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
+	dev->nReservedBlocks = 5;
+	dev->nShortOpCaches = 10; // Enable short op caching
+	
+
+	// ... and the functions.
+	if(yaffsVersion == 2)
+	{
+		dev->writeChunkWithTagsToNAND = nandmtd2_WriteChunkWithTagsToNAND;
+		dev->readChunkWithTagsFromNAND = nandmtd2_ReadChunkWithTagsFromNAND;
+		dev->markNANDBlockBad = nandmtd2_MarkNANDBlockBad;
+		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
+		dev->spareBuffer = YMALLOC(mtd->oobsize);
+		dev->isYaffs2 = 1;
+		dev->nBytesPerChunk = mtd->oobblock;
+		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
+		nBlocks = mtd->size / mtd->erasesize;
 		dev->startBlock = 0;
 		dev->endBlock = nBlocks - 1;
-		dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
-		dev->nBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-		dev->nReservedBlocks = 5;
-		dev->nShortOpCaches = 10; // Enable short op caching
-		
-
-		// ... and the functions.
-		if(yaffsVersion == 2)
-		{
-			dev->writeChunkWithTagsToNAND = nandmtd2_WriteChunkWithTagsToNAND;
-			dev->readChunkWithTagsFromNAND = nandmtd2_ReadChunkWithTagsFromNAND;
-			dev->markNANDBlockBad = nandmtd2_MarkNANDBlockBad;
-			dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
-			dev->spareBuffer = YMALLOC(mtd->oobsize);
-			dev->isYaffs2 = 1;
-			dev->nBytesPerChunk = mtd->oobblock;
-			dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
-			nBlocks = mtd->size / mtd->erasesize;
-			dev->startBlock = 0;
-			dev->endBlock = nBlocks - 1;
-		}
-		else
-		{
-			dev->writeChunkToNAND = nandmtd_WriteChunkToNAND;
-			dev->readChunkFromNAND = nandmtd_ReadChunkFromNAND;
-			dev->isYaffs2 = 0;
-		}
-		// ... and common functions
-		dev->eraseBlockInNAND = nandmtd_EraseBlockInNAND;
-		dev->initialiseNAND = nandmtd_InitialiseNAND;
-		
-		dev->putSuperFunc = yaffs_MTDPutSuper;
-		
-#ifdef CONFIG_YAFFS_USE_NANDECC
-		dev->useNANDECC = 1;
-#endif
 	}
+	else
+	{
+		dev->writeChunkToNAND = nandmtd_WriteChunkToNAND;
+		dev->readChunkFromNAND = nandmtd_ReadChunkFromNAND;
+		dev->isYaffs2 = 0;
+	}
+	// ... and common functions
+	dev->eraseBlockInNAND = nandmtd_EraseBlockInNAND;
+	dev->initialiseNAND = nandmtd_InitialiseNAND;
+	
+	dev->putSuperFunc = yaffs_MTDPutSuper;
+	
+#ifndef CONFIG_YAFFS_DOES_ECC
+	dev->useNANDECC = 1;
+#endif
 
 	/* we assume this is protected by lock_kernel() in mount/umount */
 	list_add_tail(&dev->devList, &yaffs_dev_list);