Fix a couple of mistakes in TRACE/Error messages. Update copyright date.

[yaffs2.git] / yaffs_fs.c

diff --git a/yaffs_fs.c b/yaffs_fs.c
index c2ab8888fe332edfa56b33912f2daa4cbab191a9..8f4fd329e9415ac4c5127eb242b8ef58b28e64c0 100644 (file)
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -31,7 +31,7 @@
  */
 
 const char *yaffs_fs_c_version =
-    "$Id: yaffs_fs.c,v 1.41 2006-01-27 23:54:21 tpoynor Exp $";
+    "$Id: yaffs_fs.c,v 1.45 2006-04-25 00:41:43 wookey Exp $";
 extern const char *yaffs_guts_c_version;
 
 #include <linux/config.h>
@@ -838,6 +838,15 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
 
        curoffs = 1;
 
+       /* If the directory has changed since the open or last call to
+          readdir, rewind to after the 2 canned entries. */
+
+       if (f->f_version != inode->i_version) {
+               offset = 2;
+               f->f_pos = offset;
+               f->f_version = inode->i_version;
+       }
+
        list_for_each(i, &obj->variant.directoryVariant.children) {
                curoffs++;
                if (curoffs >= offset) {
@@ -1006,15 +1015,15 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
 
        retVal = yaffs_Unlink(yaffs_InodeToObject(dir), dentry->d_name.name);
 
-       yaffs_GrossUnlock(dev);
-
        if (retVal == YAFFS_OK) {
                dentry->d_inode->i_nlink--;
+               dir->i_version++;
+               yaffs_GrossUnlock(dev);
                mark_inode_dirty(dentry->d_inode);
                return 0;
-       } else {
-               return -ENOTEMPTY;
        }
+       yaffs_GrossUnlock(dev);
+       return -ENOTEMPTY;
 }
 
 /*
@@ -1269,6 +1278,9 @@ static void yaffs_put_super(struct super_block *sb)
        yaffs_Device *dev = yaffs_SuperToDevice(sb);
 
        yaffs_GrossLock(dev);
+       
+       yaffs_FlushEntireDeviceCache(dev);
+       
        if (dev->putSuperFunc) {
                dev->putSuperFunc(sb);
        }
@@ -1277,6 +1289,11 @@ static void yaffs_put_super(struct super_block *sb)
 
        /* we assume this is protected by lock_kernel() in mount/umount */
        list_del(&dev->devList);
+       
+       if(dev->spareBuffer){
+               YFREE(dev->spareBuffer);
+               dev->spareBuffer = NULL;
+       }
 
        kfree(dev);
 }
@@ -1396,7 +1413,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
                if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
                    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
                        T(YAFFS_TRACE_ALWAYS,
-                         ("yaffs: MTD device does not support have the "
+                         ("yaffs: MTD device does not have the "
                           "right page sizes\n"));
                        return NULL;
                }
@@ -1891,5 +1908,5 @@ module_init(init_yaffs_fs)
 module_exit(exit_yaffs_fs)
 
 MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
-MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002,2003,2004");
+MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006");
 MODULE_LICENSE("GPL");