# HG changeset patch
# User Charles Manning <cdhmanning@gmail.com>
# Date 1273717756 -43200
# Node ID d21d6fd33e636332a71459fc56aaeada077d1ad4
# Parent  29b309f8db6afc4469308af30fded9c1fa3ae63f
yaffs Fix incorrect handling of deletion flag

Move the reading of the deleted flag so that it picks up any changes.

Notw we need a value on the stack because the object might get
freed and we don't want to access a hanging pointer.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/yaffs_guts.c b/yaffs_guts.c
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -5624,7 +5624,7 @@ static int yaffs_UnlinkFileIfNeeded(yaff
 int yaffs_DeleteFile(yaffs_Object *in)
 {
 	int retVal = YAFFS_OK;
-	int deleted = in->deleted;
+	int deleted; /* Need to cache value on stack if in is freed */
 	yaffs_Device *dev = in->myDev;
 
 	if (dev->param.disableSoftDelete || dev->param.isYaffs2)
@@ -5637,6 +5637,8 @@ int yaffs_DeleteFile(yaffs_Object *in)
 		if (!in->unlinked)
 			retVal = yaffs_UnlinkFileIfNeeded(in);
 
+		deleted = in->deleted;
+
 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
 			in->deleted = 1;
 			deleted = 1;