Mercurial > yaffs-ecoscentric-gpl

changeset 63:1f8272ade610

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
During scanning, only adjust shrinkSize if if is a shrink header
author charles <charles>
date Mon, 01 Aug 2005 23:36:56 +0000
parents 6bbd34cee11c
children f42d4eba1325
files yaffs_guts.c
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -13,7 +13,7 @@
  */
  //yaffs_guts.c
 
-const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.13 2005-08-01 04:53:01 charles Exp $";
+const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.14 2005-08-01 23:36:56 charles Exp $";
 
 #include "yportenv.h"
 
@@ -5278,7 +5278,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
 							isShrink = 1;
 						}
 												
-						if(in->variant.fileVariant.shrinkSize > thisSize)
+						if(isShrink &&
+						   in->variant.fileVariant.shrinkSize > thisSize)
 						{
 							in->variant.fileVariant.shrinkSize = thisSize;
 						}
@@ -5406,15 +5407,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
 							{
 								in->variant.fileVariant.fileSize = oh->fileSize;
 								in->variant.fileVariant.scannedFileSize = in->variant.fileVariant.fileSize;
-							}
+							}									
 							
-													
-							
-							if(in->variant.fileVariant.shrinkSize > oh->fileSize)
+							if(oh->isShrink &&
+							   in->variant.fileVariant.shrinkSize > oh->fileSize)
 							{
 								in->variant.fileVariant.shrinkSize = oh->fileSize;
-							}
-													
+							}						
 								
 							break;
 						case YAFFS_OBJECT_TYPE_HARDLINK: