# HG changeset patch
# User gthomas
# Date 1078926582 0
# Node ID 748c09136e092e034920bc704cc25fdb7f088e42
# Parent  00ed8504e59591877d1a5a7583ecb30923efa964
Redo some previous changes that were lost in merge with MTD files

diff --git a/packages/fs/jffs2/current/ChangeLog b/packages/fs/jffs2/current/ChangeLog
--- a/packages/fs/jffs2/current/ChangeLog
+++ b/packages/fs/jffs2/current/ChangeLog
@@ -10,6 +10,11 @@ 2004-02-20  Vincent Catros  <Vincent.Cat
 	allowing path terminated with any number of '/'
 	(i.e : chdir(/tmp///)).
 
+2004-03-03  Thomas Koeller  <thomas.koeller@baslerweb.com>
+
+       * src/fs-ecos.c:
+       Make JFFS2 honor O_TRUNC flag when opening files /w read access.
+
 2004-02-17  David Woodhouse  <dwmw2@redhat.com>
 
 	* src/fs-ecos.c:
@@ -22,7 +27,11 @@ 2004-01-27  David Woodhouse  <dwmw2@redh
 	the _parent_inode, not the child (which may be zero in the case 
 	of an unlink).
 
-004-01-05  Thomas Koeller  <thomas.koeller@baslerweb.com>
+2004-01-09  Thomas Koeller  <thomas.koeller@baslerweb.com>
+
+       * src/fs-ecos.c: Fixed inode reference counting in jffs2_ops_link().
+
+2004-01-05  Thomas Koeller  <thomas.koeller@baslerweb.com>
 
 	* cdl/jffs2.cdl: Re-added CYGPKG_FS_JFFS2_CFLAGS_REMOVE that had been
 	removed by previous change.
diff --git a/packages/fs/jffs2/current/src/fs-ecos.c b/packages/fs/jffs2/current/src/fs-ecos.c
--- a/packages/fs/jffs2/current/src/fs-ecos.c
+++ b/packages/fs/jffs2/current/src/fs-ecos.c
@@ -678,7 +678,7 @@ static int jffs2_open(cyg_mtab_entry * m
 	if (!dir)
 		dir = mte->root;
 
-#ifndef CYGOPT_FS_JFFS2_WRITE
+#ifdef CYGOPT_FS_JFFS2_WRITE
 	if (mode & (O_CREAT|O_TRUNC|O_WRONLY))
 		return EROFS;
 #endif
@@ -992,7 +992,6 @@ static int jffs2_ops_link(cyg_mtab_entry
 
 	// Allow through links to non-existing terminal objects
 	if (ds2.last && err == ENOENT) {
-		jffs2_iput(ds2.node);
 		ds2.node = NULL;
 		err = ENOERR;
 	}