From: charles <charles>
Date: Mon, 1 Aug 2005 23:36:56 +0000 (+0000)
Subject: During scanning, only adjust shrinkSize if if is a shrink header
X-Git-Tag: pre-name-change~424
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=a3dcc22e5d73aab860bca9333aa0f42e1dc9e7bf

During scanning, only adjust shrinkSize if if is a shrink header
---

diff --git a/yaffs_guts.c b/yaffs_guts.c
index d289c29..f380449 100644
--- 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_Device *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_Device *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: