Revert "yaffs: Update stats when using mtdif2."

[firefly-linux-kernel-4.4.55.git] / fs / yaffs2 / yaffs_guts.c

diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c
index 05ff48d1bc468e0ef2b582dcd0f796bd937be673..0de2ad329f92b72dc38793a8e39210e3ae278d2a 100644 (file)
--- a/fs/yaffs2/yaffs_guts.c
+++ b/fs/yaffs2/yaffs_guts.c
@@ -49,7 +49,6 @@ static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
                                const yaffs_ExtendedTags *tags);
 
 /* Other local prototypes */
-static void yaffs_UpdateParent(yaffs_Object *obj);
 static int yaffs_UnlinkObject(yaffs_Object *obj);
 static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
 
@@ -760,7 +759,7 @@ static void yaffs_VerifyObject(yaffs_Object *obj)
        chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
 
        chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-       chunkIdOk = chunkInRange || (obj->hdrChunk == 0);
+       chunkIdOk = chunkInRange || obj->hdrChunk == 0;
        chunkValid = chunkInRange &&
                        yaffs_CheckChunkBit(dev,
                                        obj->hdrChunk / dev->nChunksPerBlock,
@@ -1545,16 +1544,11 @@ 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)) {
-                       
-                       if(dev->chunkGroupSize == 1)
+                       yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
+                                                       tags);
+                       if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
+                               /* found it; */
                                return theChunk;
-                       else {
-                               yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
-                                                               tags);
-                               if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
-                                       /* found it; */
-                                       return theChunk;
-                               }
                        }
                }
                theChunk++;
@@ -2351,7 +2345,6 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
                        in = NULL;
                }
 
-               yaffs_UpdateParent(parent);
        }
 
        return in;
@@ -2506,9 +2499,6 @@ int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
                                                existingTarget->objectId);
                        yaffs_UnlinkObject(existingTarget);
                }
-               yaffs_UpdateParent(oldDir);
-               if(newDir != oldDir)
-                       yaffs_UpdateParent(newDir);
 
                return yaffs_ChangeObjectName(obj, newDir, newName, 1, 0);
        }
@@ -2974,6 +2964,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
 
        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),
@@ -2984,16 +2975,12 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
 
        /*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
         * they're going to get really deleted during GC.
         */
-       if(dev->gcChunk == 0) /* first time through for this block */
-               dev->nFreeChunks -= bi->softDeletions;
+       dev->nFreeChunks -= bi->softDeletions;
 
        dev->isDoingGC = 1;
 
@@ -3637,7 +3624,7 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
        newTags.chunkId = chunkInInode;
        newTags.objectId = in->objectId;
        newTags.serialNumber =
-           (prevChunkId > 0) ? prevTags.serialNumber + 1 : 1;
+           (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
        newTags.byteCount = nBytes;
 
        if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
@@ -3653,7 +3640,7 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
        if (newChunkId >= 0) {
                yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
 
-               if (prevChunkId > 0)
+               if (prevChunkId >= 0)
                        yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
 
                yaffs_CheckFileSanity(in);
@@ -3739,7 +3726,7 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
                if (name && *name) {
                        memset(oh->name, 0, sizeof(oh->name));
                        yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
-               } else if (prevChunkId > 0)
+               } else if (prevChunkId >= 0)
                        memcpy(oh->name, oldName, sizeof(oh->name));
                else
                        memset(oh->name, 0, sizeof(oh->name));
@@ -3797,13 +3784,13 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
                /* Create new chunk in NAND */
                newChunkId =
                    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
-                                                     (prevChunkId > 0) ? 1 : 0);
+                                                     (prevChunkId >= 0) ? 1 : 0);
 
                if (newChunkId >= 0) {
 
                        in->hdrChunk = newChunkId;
 
-                       if (prevChunkId > 0) {
+                       if (prevChunkId >= 0) {
                                yaffs_DeleteChunk(dev, prevChunkId, 1,
                                                  __LINE__);
                        }
@@ -5177,19 +5164,14 @@ int yaffs_DeleteFile(yaffs_Object *in)
        }
 }
 
-static int yaffs_IsNonEmptyDirectory(yaffs_Object *obj)
-{
-       return (obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) &&
-               !(ylist_empty(&obj->variant.directoryVariant.children));
-}
-
-static int yaffs_DeleteDirectory(yaffs_Object *obj)
+static int yaffs_DeleteDirectory(yaffs_Object *in)
 {
        /* First check that the directory is empty. */
-       if (yaffs_IsNonEmptyDirectory(obj))
-               return YAFFS_FAIL;
+       if (ylist_empty(&in->variant.directoryVariant.children))
+               return yaffs_DoGenericObjectDeletion(in);
+
+       return YAFFS_FAIL;
 
-       return yaffs_DoGenericObjectDeletion(obj);
 }
 
 static int yaffs_DeleteSymLink(yaffs_Object *in)
@@ -5248,9 +5230,6 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj)
                immediateDeletion = 1;
 #endif
 
-       if(obj)
-               yaffs_UpdateParent(obj->parent);
-
        if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
                return yaffs_DeleteHardLink(obj);
        } else if (!ylist_empty(&obj->hardLinks)) {
@@ -5305,9 +5284,7 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj)
                default:
                        return YAFFS_FAIL;
                }
-       } else if(yaffs_IsNonEmptyDirectory(obj))
-               return YAFFS_FAIL;
-       else
+       } else
                return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
                                           _Y("unlinked"), 0, 0);
 }
@@ -6689,26 +6666,6 @@ static void yaffs_VerifyDirectory(yaffs_Object *directory)
        }
 }
 
-/*
- *yaffs_UpdateParent() handles fixing a directories mtime and ctime when a new
- * link (ie. name) is created or deleted in the directory.
- *
- * ie.
- *   create dir/a : update dir's mtime/ctime
- *   rm dir/a:   update dir's mtime/ctime
- *   modify dir/a: don't update dir's mtimme/ctime
- */
- 
-static void yaffs_UpdateParent(yaffs_Object *obj)
-{
-       if(!obj)
-               return;
-
-       obj->dirty = 1;
-       obj->yst_mtime = obj->yst_ctime = Y_CURRENT_TIME;
-
-       yaffs_UpdateObjectHeader(obj,NULL,0,0,0);
-}
 
 static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
 {
@@ -6726,10 +6683,11 @@ static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
 
        ylist_del_init(&obj->siblings);
        obj->parent = NULL;
-       
+
        yaffs_VerifyDirectory(parent);
 }
 
+
 static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
                                        yaffs_Object *obj)
 {
@@ -6823,7 +6781,7 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
                                 * Do a real check
                                 */
                                yaffs_GetObjectName(l, buffer,
-                                                   YAFFS_MAX_NAME_LENGTH + 1);
+                                                   YAFFS_MAX_NAME_LENGTH);
                                if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
                                        return l;
                        }
@@ -7072,7 +7030,7 @@ int yaffs_DumpObject(yaffs_Object *obj)
 {
        YCHAR name[257];
 
-       yaffs_GetObjectName(obj, name, YAFFS_MAX_NAME_LENGTH + 1);
+       yaffs_GetObjectName(obj, name, 256);
 
        T(YAFFS_TRACE_ALWAYS,
          (TSTR
@@ -7436,9 +7394,6 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
        yaffs_VerifyFreeChunks(dev);
        yaffs_VerifyBlocks(dev);
 
-       /* Clean up any aborted checkpoint data */
-       if (!dev->isCheckpointed && dev->blocksInCheckpoint > 0)
-               yaffs_InvalidateCheckpoint(dev);
 
        T(YAFFS_TRACE_TRACING,
          (TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR)));