projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change defualt fs permissions
[yaffs2.git]
/
yaffs_guts.c
diff --git
a/yaffs_guts.c
b/yaffs_guts.c
index 81ae37a400425ae696818bfa0cdd2180f6e4ba58..2acfb8e031b4e83f18b1bb03d1a28d25f8ba14a1 100644
(file)
--- a/
yaffs_guts.c
+++ b/
yaffs_guts.c
@@
-12,7
+12,7
@@
*/
const char *yaffs_guts_c_version =
*/
const char *yaffs_guts_c_version =
- "$Id: yaffs_guts.c,v 1.8
6 2009-07-28 03:04:54
charles Exp $";
+ "$Id: yaffs_guts.c,v 1.8
9 2009-09-09 00:56:53
charles Exp $";
#include "yportenv.h"
#include "yportenv.h"
@@
-1545,11
+1545,16
@@
static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
theChunk % dev->nChunksPerBlock)) {
for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
theChunk % dev->nChunksPerBlock)) {
- yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- tags);
- if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- /* found it; */
+
+ if(dev->chunkGroupSize == 1)
return theChunk;
return theChunk;
+ else {
+ yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
+ tags);
+ if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
+ /* found it; */
+ return theChunk;
+ }
}
}
theChunk++;
}
}
theChunk++;
@@
-2969,7
+2974,6
@@
static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
isCheckpointBlock = (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT);
isCheckpointBlock = (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT);
- bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
T(YAFFS_TRACE_TRACING,
(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
T(YAFFS_TRACE_TRACING,
(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
@@
-2980,6
+2984,9
@@
static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
/*yaffs_VerifyFreeChunks(dev); */
/*yaffs_VerifyFreeChunks(dev); */
+ if(bi->blockState == YAFFS_BLOCK_STATE_FULL)
+ bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
+
bi->hasShrinkHeader = 0; /* clear the flag so that the block can erase */
/* Take off the number of soft deleted entries because
bi->hasShrinkHeader = 0; /* clear the flag so that the block can erase */
/* Take off the number of soft deleted entries because
@@
-5170,14
+5177,19
@@
int yaffs_DeleteFile(yaffs_Object *in)
}
}
}
}
-static int yaffs_
DeleteDirectory(yaffs_Object *in
)
+static int yaffs_
IsNonEmptyDirectory(yaffs_Object *obj
)
{
{
- /* First check that the directory is empty. */
- if (ylist_empty(&in->variant.directoryVariant.children))
- return yaffs_DoGenericObjectDeletion(in);
+ return (obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) &&
+ !(ylist_empty(&obj->variant.directoryVariant.children));
+}
- return YAFFS_FAIL;
+static int yaffs_DeleteDirectory(yaffs_Object *obj)
+{
+ /* First check that the directory is empty. */
+ if (yaffs_IsNonEmptyDirectory(obj))
+ return YAFFS_FAIL;
+ return yaffs_DoGenericObjectDeletion(obj);
}
static int yaffs_DeleteSymLink(yaffs_Object *in)
}
static int yaffs_DeleteSymLink(yaffs_Object *in)
@@
-5293,7
+5305,9
@@
static int yaffs_UnlinkWorker(yaffs_Object *obj)
default:
return YAFFS_FAIL;
}
default:
return YAFFS_FAIL;
}
- } else
+ } else if(yaffs_IsNonEmptyDirectory(obj))
+ return YAFFS_FAIL;
+ else
return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
_Y("unlinked"), 0, 0);
}
return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
_Y("unlinked"), 0, 0);
}
@@
-6809,7
+6823,7
@@
yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
* Do a real check
*/
yaffs_GetObjectName(l, buffer,
* Do a real check
*/
yaffs_GetObjectName(l, buffer,
- YAFFS_MAX_NAME_LENGTH);
+ YAFFS_MAX_NAME_LENGTH
+ 1
);
if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
return l;
}
if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
return l;
}
@@
-7058,7
+7072,7
@@
int yaffs_DumpObject(yaffs_Object *obj)
{
YCHAR name[257];
{
YCHAR name[257];
- yaffs_GetObjectName(obj, name,
256
);
+ yaffs_GetObjectName(obj, name,
YAFFS_MAX_NAME_LENGTH + 1
);
T(YAFFS_TRACE_ALWAYS,
(TSTR
T(YAFFS_TRACE_ALWAYS,
(TSTR