From 401f9eb48ce20b18902ad9a4a8039d43e363d2ec Mon Sep 17 00:00:00 2001 From: Charles Manning Date: Thu, 13 May 2010 14:29:16 +1200 Subject: [PATCH] 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 --- yaffs_guts.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yaffs_guts.c b/yaffs_guts.c index d55aa95..9509dd4 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -5624,7 +5624,7 @@ static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in) 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; -- 2.30.2