fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / jffs2 / write.c

diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c
index f28d9d5..6717679 100644 (file)
--- a/fs/jffs2/write.c
+++ b/fs/jffs2/write.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 2001-2003 Red Hat, Inc.
  *
  *
  * Copyright (C) 2001-2003 Red Hat, Inc.
  *

- * Created by David Woodhouse <dwmw2@redhat.com>
+ * Created by David Woodhouse <dwmw2@infradead.org>

  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *

- * $Id: write.c,v 1.75 2003/10/08 11:45:11 dwmw2 Exp $
+ * $Id: write.c,v 1.97 2005/11/07 11:14:42 gleixner Exp $

  *
  */
 
  *
  */
 


@@ -18,6 +18,7 @@
 #include <linux/pagemap.h>
 #include <linux/mtd/mtd.h>
 #include "nodelist.h"
 #include <linux/pagemap.h>
 #include <linux/mtd/mtd.h>
 #include "nodelist.h"

+#include "compr.h"

 
 
 int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint32_t mode, struct jffs2_raw_inode *ri)
 
 
 int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint32_t mode, struct jffs2_raw_inode *ri)


@@ -31,17 +32,14 @@ int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint
 
        memset(ic, 0, sizeof(*ic));
 
 
        memset(ic, 0, sizeof(*ic));
 

-       init_MUTEX_LOCKED(&f->sem);

        f->inocache = ic;
        f->inocache->nlink = 1;
        f->inocache->nodes = (struct jffs2_raw_node_ref *)f->inocache;
        f->inocache = ic;
        f->inocache->nlink = 1;
        f->inocache->nodes = (struct jffs2_raw_node_ref *)f->inocache;

-       f->inocache->ino = ++c->highest_ino;

        f->inocache->state = INO_STATE_PRESENT;
 
        f->inocache->state = INO_STATE_PRESENT;
 

-       ri->ino = cpu_to_je32(f->inocache->ino);
-
-       D1(printk(KERN_DEBUG "jffs2_do_new_inode(): Assigned ino# %d\n", f->inocache->ino));

        jffs2_add_ino_cache(c, f->inocache);
        jffs2_add_ino_cache(c, f->inocache);

+       D1(printk(KERN_DEBUG "jffs2_do_new_inode(): Assigned ino# %d\n", f->inocache->ino));
+       ri->ino = cpu_to_je32(f->inocache->ino);

 
        ri->magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
        ri->nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE);
 
        ri->magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
        ri->nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE);


@@ -55,44 +53,18 @@ int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint
        return 0;
 }
 
        return 0;
 }
 

-#if CONFIG_JFFS2_FS_DEBUG > 0
-static void writecheck(struct jffs2_sb_info *c, uint32_t ofs)
-{
-       unsigned char buf[16];
-       size_t retlen;
-       int ret, i;
-
-       ret = jffs2_flash_read(c, ofs, 16, &retlen, buf);
-       if (ret || (retlen != 16)) {
-               D1(printk(KERN_DEBUG "read failed or short in writecheck(). ret %d, retlen %zd\n", ret, retlen));
-               return;
-       }
-       ret = 0;
-       for (i=0; i<16; i++) {
-               if (buf[i] != 0xff)
-                       ret = 1;
-       }
-       if (ret) {
-               printk(KERN_WARNING "ARGH. About to write node to 0x%08x on flash, but there are data already there:\n", ofs);
-               printk(KERN_WARNING "0x%08x: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", 
-                      ofs,
-                      buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7],
-                      buf[8], buf[9], buf[10], buf[11], buf[12], buf[13], buf[14], buf[15]);
-       }
-}
-#endif
-
-
-/* jffs2_write_dnode - given a raw_inode, allocate a full_dnode for it, 
+/* jffs2_write_dnode - given a raw_inode, allocate a full_dnode for it,

    write it to the flash, link it into the existing inode/fragment list */
 
    write it to the flash, link it into the existing inode/fragment list */
 

-struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_raw_inode *ri, const unsigned char *data, uint32_t datalen, uint32_t flash_ofs, int alloc_mode)
+struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
+                                          struct jffs2_raw_inode *ri, const unsigned char *data,
+                                          uint32_t datalen, int alloc_mode)

 
 {
 
 {

-       struct jffs2_raw_node_ref *raw;

        struct jffs2_full_dnode *fn;
        size_t retlen;
        struct jffs2_full_dnode *fn;
        size_t retlen;

-       struct iovec vecs[2];
+       uint32_t flash_ofs;
+       struct kvec vecs[2];

        int ret;
        int retried = 0;
        unsigned long cnt = 2;
        int ret;
        int retried = 0;
        unsigned long cnt = 2;


@@ -107,60 +79,50 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2
        vecs[1].iov_base = (unsigned char *)data;
        vecs[1].iov_len = datalen;
 
        vecs[1].iov_base = (unsigned char *)data;
        vecs[1].iov_len = datalen;
 

-       D1(writecheck(c, flash_ofs));
-

        if (je32_to_cpu(ri->totlen) != sizeof(*ri) + datalen) {
                printk(KERN_WARNING "jffs2_write_dnode: ri->totlen (0x%08x) != sizeof(*ri) (0x%08zx) + datalen (0x%08x)\n", je32_to_cpu(ri->totlen), sizeof(*ri), datalen);
        }
        if (je32_to_cpu(ri->totlen) != sizeof(*ri) + datalen) {
                printk(KERN_WARNING "jffs2_write_dnode: ri->totlen (0x%08x) != sizeof(*ri) (0x%08zx) + datalen (0x%08x)\n", je32_to_cpu(ri->totlen), sizeof(*ri), datalen);
        }

-       raw = jffs2_alloc_raw_node_ref();
-       if (!raw)
-               return ERR_PTR(-ENOMEM);
-       
+

        fn = jffs2_alloc_full_dnode();
        fn = jffs2_alloc_full_dnode();

-       if (!fn) {
-               jffs2_free_raw_node_ref(raw);
+       if (!fn)

                return ERR_PTR(-ENOMEM);
                return ERR_PTR(-ENOMEM);

-       }
-
-       fn->ofs = je32_to_cpu(ri->offset);
-       fn->size = je32_to_cpu(ri->dsize);
-       fn->frags = 0;

 
        /* check number of valid vecs */
        if (!datalen || !data)
                cnt = 1;
  retry:
 
        /* check number of valid vecs */
        if (!datalen || !data)
                cnt = 1;
  retry:

-       fn->raw = raw;
+       flash_ofs = write_ofs(c);

 
 

-       raw->flash_offset = flash_ofs;
-       raw->totlen = PAD(sizeof(*ri)+datalen);
-       raw->next_phys = NULL;
+       jffs2_dbg_prewrite_paranoia_check(c, flash_ofs, vecs[0].iov_len + vecs[1].iov_len);
+
+       if ((alloc_mode!=ALLOC_GC) && (je32_to_cpu(ri->version) < f->highest_version)) {
+               BUG_ON(!retried);
+               D1(printk(KERN_DEBUG "jffs2_write_dnode : dnode_version %d, "
+                               "highest version %d -> updating dnode\n",
+                               je32_to_cpu(ri->version), f->highest_version));
+               ri->version = cpu_to_je32(++f->highest_version);
+               ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));
+       }

 
        ret = jffs2_flash_writev(c, vecs, cnt, flash_ofs, &retlen,
                                 (alloc_mode==ALLOC_GC)?0:f->inocache->ino);
 
        if (ret || (retlen != sizeof(*ri) + datalen)) {
 
        ret = jffs2_flash_writev(c, vecs, cnt, flash_ofs, &retlen,
                                 (alloc_mode==ALLOC_GC)?0:f->inocache->ino);
 
        if (ret || (retlen != sizeof(*ri) + datalen)) {

-               printk(KERN_NOTICE "Write of %zd bytes at 0x%08x failed. returned %d, retlen %zd\n", 
+               printk(KERN_NOTICE "Write of %zd bytes at 0x%08x failed. returned %d, retlen %zd\n",

                       sizeof(*ri)+datalen, flash_ofs, ret, retlen);
 
                /* Mark the space as dirtied */
                if (retlen) {
                       sizeof(*ri)+datalen, flash_ofs, ret, retlen);
 
                /* Mark the space as dirtied */
                if (retlen) {

-                       /* Doesn't belong to any inode */
-                       raw->next_in_ino = NULL;
-
-                       /* Don't change raw->size to match retlen. We may have 
+                       /* Don't change raw->size to match retlen. We may have

                           written the node header already, and only the data will
                           seem corrupted, in which case the scan would skip over
                           written the node header already, and only the data will
                           seem corrupted, in which case the scan would skip over

-                          any node we write before the original intended end of 
+                          any node we write before the original intended end of

                           this node */
                           this node */

-                       raw->flash_offset |= REF_OBSOLETE;
-                       jffs2_add_physical_node_ref(c, raw);
-                       jffs2_mark_node_obsolete(c, raw);
+                       jffs2_add_physical_node_ref(c, flash_ofs | REF_OBSOLETE, PAD(sizeof(*ri)+datalen), NULL);

                } else {
                } else {

-                       printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", raw->flash_offset);
-                       jffs2_free_raw_node_ref(raw);
+                       printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", flash_ofs);

                }
                }

-               if (!retried && alloc_mode != ALLOC_NORETRY && (raw = jffs2_alloc_raw_node_ref())) {
+               if (!retried && alloc_mode != ALLOC_NORETRY) {

                        /* Try to reallocate space and retry */
                        uint32_t dummy;
                        struct jffs2_eraseblock *jeb = &c->blocks[flash_ofs / c->sector_size];
                        /* Try to reallocate space and retry */
                        uint32_t dummy;
                        struct jffs2_eraseblock *jeb = &c->blocks[flash_ofs / c->sector_size];


@@ -168,101 +130,95 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2
                        retried = 1;
 
                        D1(printk(KERN_DEBUG "Retrying failed write.\n"));
                        retried = 1;
 
                        D1(printk(KERN_DEBUG "Retrying failed write.\n"));

-                       
-                       ACCT_SANITY_CHECK(c,jeb);
-                       D1(ACCT_PARANOIA_CHECK(jeb));
+
+                       jffs2_dbg_acct_sanity_check(c,jeb);
+                       jffs2_dbg_acct_paranoia_check(c, jeb);

 
                        if (alloc_mode == ALLOC_GC) {
 
                        if (alloc_mode == ALLOC_GC) {

-                               ret = jffs2_reserve_space_gc(c, sizeof(*ri) + datalen, &flash_ofs, &dummy);
+                               ret = jffs2_reserve_space_gc(c, sizeof(*ri) + datalen, &dummy,
+                                                            JFFS2_SUMMARY_INODE_SIZE);

                        } else {
                                /* Locking pain */
                                up(&f->sem);
                                jffs2_complete_reservation(c);
                        } else {
                                /* Locking pain */
                                up(&f->sem);
                                jffs2_complete_reservation(c);

-                       
-                               ret = jffs2_reserve_space(c, sizeof(*ri) + datalen, &flash_ofs, &dummy, alloc_mode);
+
+                               ret = jffs2_reserve_space(c, sizeof(*ri) + datalen, &dummy,
+                                                         alloc_mode, JFFS2_SUMMARY_INODE_SIZE);

                                down(&f->sem);
                        }
 
                        if (!ret) {
                                down(&f->sem);
                        }
 
                        if (!ret) {

+                               flash_ofs = write_ofs(c);

                                D1(printk(KERN_DEBUG "Allocated space at 0x%08x to retry failed write.\n", flash_ofs));
 
                                D1(printk(KERN_DEBUG "Allocated space at 0x%08x to retry failed write.\n", flash_ofs));
 

-                               ACCT_SANITY_CHECK(c,jeb);
-                               D1(ACCT_PARANOIA_CHECK(jeb));
+                               jffs2_dbg_acct_sanity_check(c,jeb);
+                               jffs2_dbg_acct_paranoia_check(c, jeb);

 
                                goto retry;
                        }
                        D1(printk(KERN_DEBUG "Failed to allocate space to retry failed write: %d!\n", ret));
 
                                goto retry;
                        }
                        D1(printk(KERN_DEBUG "Failed to allocate space to retry failed write: %d!\n", ret));

-                       jffs2_free_raw_node_ref(raw);

                }
                /* Release the full_dnode which is now useless, and return */
                jffs2_free_full_dnode(fn);
                return ERR_PTR(ret?ret:-EIO);
        }
        /* Mark the space used */
                }
                /* Release the full_dnode which is now useless, and return */
                jffs2_free_full_dnode(fn);
                return ERR_PTR(ret?ret:-EIO);
        }
        /* Mark the space used */

-       /* If node covers at least a whole page, or if it starts at the 
-          beginning of a page and runs to the end of the file, or if 
-          it's a hole node, mark it REF_PRISTINE, else REF_NORMAL. 
+       /* If node covers at least a whole page, or if it starts at the
+          beginning of a page and runs to the end of the file, or if
+          it's a hole node, mark it REF_PRISTINE, else REF_NORMAL.

        */
        if ((je32_to_cpu(ri->dsize) >= PAGE_CACHE_SIZE) ||
            ( ((je32_to_cpu(ri->offset)&(PAGE_CACHE_SIZE-1))==0) &&
              (je32_to_cpu(ri->dsize)+je32_to_cpu(ri->offset) ==  je32_to_cpu(ri->isize)))) {
        */
        if ((je32_to_cpu(ri->dsize) >= PAGE_CACHE_SIZE) ||
            ( ((je32_to_cpu(ri->offset)&(PAGE_CACHE_SIZE-1))==0) &&
              (je32_to_cpu(ri->dsize)+je32_to_cpu(ri->offset) ==  je32_to_cpu(ri->isize)))) {

-               raw->flash_offset |= REF_PRISTINE;
+               flash_ofs |= REF_PRISTINE;

        } else {
        } else {

-               raw->flash_offset |= REF_NORMAL;
+               flash_ofs |= REF_NORMAL;

        }
        }

-       jffs2_add_physical_node_ref(c, raw);
-
-       /* Link into per-inode list */
-       raw->next_in_ino = f->inocache->nodes;
-       f->inocache->nodes = raw;
+       fn->raw = jffs2_add_physical_node_ref(c, flash_ofs, PAD(sizeof(*ri)+datalen), f->inocache);
+       fn->ofs = je32_to_cpu(ri->offset);
+       fn->size = je32_to_cpu(ri->dsize);
+       fn->frags = 0;

 
        D1(printk(KERN_DEBUG "jffs2_write_dnode wrote node at 0x%08x(%d) with dsize 0x%x, csize 0x%x, node_crc 0x%08x, data_crc 0x%08x, totlen 0x%08x\n",
 
        D1(printk(KERN_DEBUG "jffs2_write_dnode wrote node at 0x%08x(%d) with dsize 0x%x, csize 0x%x, node_crc 0x%08x, data_crc 0x%08x, totlen 0x%08x\n",

-                 flash_ofs, ref_flags(raw), je32_to_cpu(ri->dsize), 
+                 flash_ofs & ~3, flash_ofs & 3, je32_to_cpu(ri->dsize),

                  je32_to_cpu(ri->csize), je32_to_cpu(ri->node_crc),
                  je32_to_cpu(ri->data_crc), je32_to_cpu(ri->totlen)));
 
        if (retried) {
                  je32_to_cpu(ri->csize), je32_to_cpu(ri->node_crc),
                  je32_to_cpu(ri->data_crc), je32_to_cpu(ri->totlen)));
 
        if (retried) {

-               ACCT_SANITY_CHECK(c,NULL);
+               jffs2_dbg_acct_sanity_check(c,NULL);

        }
 
        return fn;
 }
 
        }
 
        return fn;
 }
 

-struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_raw_dirent *rd, const unsigned char *name, uint32_t namelen, uint32_t flash_ofs, int alloc_mode)
+struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
+                                            struct jffs2_raw_dirent *rd, const unsigned char *name,
+                                            uint32_t namelen, int alloc_mode)

 {
 {

-       struct jffs2_raw_node_ref *raw;

        struct jffs2_full_dirent *fd;
        size_t retlen;
        struct jffs2_full_dirent *fd;
        size_t retlen;

-       struct iovec vecs[2];
+       struct kvec vecs[2];
+       uint32_t flash_ofs;

        int retried = 0;
        int ret;
 
        int retried = 0;
        int ret;
 

-       D1(printk(KERN_DEBUG "jffs2_write_dirent(ino #%u, name at *0x%p \"%s\"->ino #%u, name_crc 0x%08x)\n", 
+       D1(printk(KERN_DEBUG "jffs2_write_dirent(ino #%u, name at *0x%p \"%s\"->ino #%u, name_crc 0x%08x)\n",

                  je32_to_cpu(rd->pino), name, name, je32_to_cpu(rd->ino),
                  je32_to_cpu(rd->name_crc)));
                  je32_to_cpu(rd->pino), name, name, je32_to_cpu(rd->ino),
                  je32_to_cpu(rd->name_crc)));

-       D1(writecheck(c, flash_ofs));

 
        D1(if(je32_to_cpu(rd->hdr_crc) != crc32(0, rd, sizeof(struct jffs2_unknown_node)-4)) {
                printk(KERN_CRIT "Eep. CRC not correct in jffs2_write_dirent()\n");
                BUG();
 
        D1(if(je32_to_cpu(rd->hdr_crc) != crc32(0, rd, sizeof(struct jffs2_unknown_node)-4)) {
                printk(KERN_CRIT "Eep. CRC not correct in jffs2_write_dirent()\n");
                BUG();

-       }
-          );
+          });

 
        vecs[0].iov_base = rd;
        vecs[0].iov_len = sizeof(*rd);
        vecs[1].iov_base = (unsigned char *)name;
        vecs[1].iov_len = namelen;
 
        vecs[0].iov_base = rd;
        vecs[0].iov_len = sizeof(*rd);
        vecs[1].iov_base = (unsigned char *)name;
        vecs[1].iov_len = namelen;

-       
-       raw = jffs2_alloc_raw_node_ref();
-
-       if (!raw)
-               return ERR_PTR(-ENOMEM);

 
        fd = jffs2_alloc_full_dirent(namelen+1);
 
        fd = jffs2_alloc_full_dirent(namelen+1);

-       if (!fd) {
-               jffs2_free_raw_node_ref(raw);
+       if (!fd)

                return ERR_PTR(-ENOMEM);
                return ERR_PTR(-ENOMEM);

-       }

 
        fd->version = je32_to_cpu(rd->version);
        fd->ino = je32_to_cpu(rd->ino);
 
        fd->version = je32_to_cpu(rd->version);
        fd->ino = je32_to_cpu(rd->ino);


@@ -272,28 +228,32 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff
        fd->name[namelen]=0;
 
  retry:
        fd->name[namelen]=0;
 
  retry:

-       fd->raw = raw;
-
-       raw->flash_offset = flash_ofs;
-       raw->totlen = PAD(sizeof(*rd)+namelen);
-       raw->next_phys = NULL;
+       flash_ofs = write_ofs(c);
+
+       jffs2_dbg_prewrite_paranoia_check(c, flash_ofs, vecs[0].iov_len + vecs[1].iov_len);
+
+       if ((alloc_mode!=ALLOC_GC) && (je32_to_cpu(rd->version) < f->highest_version)) {
+               BUG_ON(!retried);
+               D1(printk(KERN_DEBUG "jffs2_write_dirent : dirent_version %d, "
+                                    "highest version %d -> updating dirent\n",
+                                    je32_to_cpu(rd->version), f->highest_version));
+               rd->version = cpu_to_je32(++f->highest_version);
+               fd->version = je32_to_cpu(rd->version);
+               rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));
+       }

 
        ret = jffs2_flash_writev(c, vecs, 2, flash_ofs, &retlen,
 
        ret = jffs2_flash_writev(c, vecs, 2, flash_ofs, &retlen,

-                                (alloc_mode==ALLOC_GC)?0:fd->ino);
+                                (alloc_mode==ALLOC_GC)?0:je32_to_cpu(rd->pino));

        if (ret || (retlen != sizeof(*rd) + namelen)) {
        if (ret || (retlen != sizeof(*rd) + namelen)) {

-               printk(KERN_NOTICE "Write of %zd bytes at 0x%08x failed. returned %d, retlen %zd\n", 
+               printk(KERN_NOTICE "Write of %zd bytes at 0x%08x failed. returned %d, retlen %zd\n",

                               sizeof(*rd)+namelen, flash_ofs, ret, retlen);
                /* Mark the space as dirtied */
                if (retlen) {
                               sizeof(*rd)+namelen, flash_ofs, ret, retlen);
                /* Mark the space as dirtied */
                if (retlen) {

-                       raw->next_in_ino = NULL;
-                       raw->flash_offset |= REF_OBSOLETE;
-                       jffs2_add_physical_node_ref(c, raw);
-                       jffs2_mark_node_obsolete(c, raw);
+                       jffs2_add_physical_node_ref(c, flash_ofs | REF_OBSOLETE, PAD(sizeof(*rd)+namelen), NULL);

                } else {
                } else {

-                       printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", raw->flash_offset);
-                       jffs2_free_raw_node_ref(raw);
+                       printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", flash_ofs);

                }
                }

-               if (!retried && (raw = jffs2_alloc_raw_node_ref())) {
+               if (!retried) {

                        /* Try to reallocate space and retry */
                        uint32_t dummy;
                        struct jffs2_eraseblock *jeb = &c->blocks[flash_ofs / c->sector_size];
                        /* Try to reallocate space and retry */
                        uint32_t dummy;
                        struct jffs2_eraseblock *jeb = &c->blocks[flash_ofs / c->sector_size];


@@ -302,42 +262,40 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff
 
                        D1(printk(KERN_DEBUG "Retrying failed write.\n"));
 
 
                        D1(printk(KERN_DEBUG "Retrying failed write.\n"));
 

-                       ACCT_SANITY_CHECK(c,jeb);
-                       D1(ACCT_PARANOIA_CHECK(jeb));
+                       jffs2_dbg_acct_sanity_check(c,jeb);
+                       jffs2_dbg_acct_paranoia_check(c, jeb);

 
                        if (alloc_mode == ALLOC_GC) {
 
                        if (alloc_mode == ALLOC_GC) {

-                               ret = jffs2_reserve_space_gc(c, sizeof(*rd) + namelen, &flash_ofs, &dummy);
+                               ret = jffs2_reserve_space_gc(c, sizeof(*rd) + namelen, &dummy,
+                                                            JFFS2_SUMMARY_DIRENT_SIZE(namelen));

                        } else {
                                /* Locking pain */
                                up(&f->sem);
                                jffs2_complete_reservation(c);
                        } else {
                                /* Locking pain */
                                up(&f->sem);
                                jffs2_complete_reservation(c);

-                       
-                               ret = jffs2_reserve_space(c, sizeof(*rd) + namelen, &flash_ofs, &dummy, alloc_mode);
+
+                               ret = jffs2_reserve_space(c, sizeof(*rd) + namelen, &dummy,
+                                                         alloc_mode, JFFS2_SUMMARY_DIRENT_SIZE(namelen));

                                down(&f->sem);
                        }
 
                        if (!ret) {
                                down(&f->sem);
                        }
 
                        if (!ret) {

+                               flash_ofs = write_ofs(c);

                                D1(printk(KERN_DEBUG "Allocated space at 0x%08x to retry failed write.\n", flash_ofs));
                                D1(printk(KERN_DEBUG "Allocated space at 0x%08x to retry failed write.\n", flash_ofs));

-                               ACCT_SANITY_CHECK(c,jeb);
-                               D1(ACCT_PARANOIA_CHECK(jeb));
+                               jffs2_dbg_acct_sanity_check(c,jeb);
+                               jffs2_dbg_acct_paranoia_check(c, jeb);

                                goto retry;
                        }
                        D1(printk(KERN_DEBUG "Failed to allocate space to retry failed write: %d!\n", ret));
                                goto retry;
                        }
                        D1(printk(KERN_DEBUG "Failed to allocate space to retry failed write: %d!\n", ret));

-                       jffs2_free_raw_node_ref(raw);

                }
                /* Release the full_dnode which is now useless, and return */
                jffs2_free_full_dirent(fd);
                return ERR_PTR(ret?ret:-EIO);
        }
        /* Mark the space used */
                }
                /* Release the full_dnode which is now useless, and return */
                jffs2_free_full_dirent(fd);
                return ERR_PTR(ret?ret:-EIO);
        }
        /* Mark the space used */

-       raw->flash_offset |= REF_PRISTINE;
-       jffs2_add_physical_node_ref(c, raw);
-
-       raw->next_in_ino = f->inocache->nodes;
-       f->inocache->nodes = raw;
+       fd->raw = jffs2_add_physical_node_ref(c, flash_ofs | REF_PRISTINE, PAD(sizeof(*rd)+namelen), f->inocache);

 
        if (retried) {
 
        if (retried) {

-               ACCT_SANITY_CHECK(c,NULL);
+               jffs2_dbg_acct_sanity_check(c,NULL);

        }
 
        return fd;
        }
 
        return fd;


@@ -347,7 +305,7 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff
    we don't have to go digging in struct inode or its equivalent. It should set:
    mode, uid, gid, (starting)isize, atime, ctime, mtime */
 int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
    we don't have to go digging in struct inode or its equivalent. It should set:
    mode, uid, gid, (starting)isize, atime, ctime, mtime */
 int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,

-                           struct jffs2_raw_inode *ri, unsigned char *buf, 
+                           struct jffs2_raw_inode *ri, unsigned char *buf,

                            uint32_t offset, uint32_t writelen, uint32_t *retlen)
 {
        int ret = 0;
                            uint32_t offset, uint32_t writelen, uint32_t *retlen)
 {
        int ret = 0;


@@ -355,42 +313,29 @@ int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
 
                D1(printk(KERN_DEBUG "jffs2_write_inode_range(): Ino #%u, ofs 0x%x, len 0x%x\n",
                  f->inocache->ino, offset, writelen));
 
                D1(printk(KERN_DEBUG "jffs2_write_inode_range(): Ino #%u, ofs 0x%x, len 0x%x\n",
                  f->inocache->ino, offset, writelen));

-               
+

        while(writelen) {
                struct jffs2_full_dnode *fn;
                unsigned char *comprbuf = NULL;
        while(writelen) {
                struct jffs2_full_dnode *fn;
                unsigned char *comprbuf = NULL;

-               unsigned char comprtype = JFFS2_COMPR_NONE;
-               uint32_t phys_ofs, alloclen;
+               uint16_t comprtype = JFFS2_COMPR_NONE;
+               uint32_t alloclen;

                uint32_t datalen, cdatalen;
                int retried = 0;
 
        retry:
                D2(printk(KERN_DEBUG "jffs2_commit_write() loop: 0x%x to write to 0x%x\n", writelen, offset));
 
                uint32_t datalen, cdatalen;
                int retried = 0;
 
        retry:
                D2(printk(KERN_DEBUG "jffs2_commit_write() loop: 0x%x to write to 0x%x\n", writelen, offset));
 

-               ret = jffs2_reserve_space(c, sizeof(*ri) + JFFS2_MIN_DATA_LEN, &phys_ofs, &alloclen, ALLOC_NORMAL);
+               ret = jffs2_reserve_space(c, sizeof(*ri) + JFFS2_MIN_DATA_LEN,
+                                       &alloclen, ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);

                if (ret) {
                        D1(printk(KERN_DEBUG "jffs2_reserve_space returned %d\n", ret));
                        break;
                }
                down(&f->sem);
                if (ret) {
                        D1(printk(KERN_DEBUG "jffs2_reserve_space returned %d\n", ret));
                        break;
                }
                down(&f->sem);

-               datalen = writelen;
-               cdatalen = min_t(uint32_t, alloclen - sizeof(*ri), writelen);
+               datalen = min_t(uint32_t, writelen, PAGE_CACHE_SIZE - (offset & (PAGE_CACHE_SIZE-1)));
+               cdatalen = min_t(uint32_t, alloclen - sizeof(*ri), datalen);

 
 

-               comprbuf = kmalloc(cdatalen, GFP_KERNEL);
-               if (comprbuf) {
-                       comprtype = jffs2_compress(buf, comprbuf, &datalen, &cdatalen);
-               }
-               if (comprtype == JFFS2_COMPR_NONE) {
-                       /* Either compression failed, or the allocation of comprbuf failed */
-                       if (comprbuf)
-                               kfree(comprbuf);
-                       comprbuf = buf;
-                       datalen = cdatalen;
-               }
-               /* Now comprbuf points to the data to be written, be it compressed or not.
-                  comprtype holds the compression type, and comprtype == JFFS2_COMPR_NONE means
-                  that the comprbuf doesn't need to be kfree()d. 
-               */
+               comprtype = jffs2_compress(c, f, buf, &comprbuf, &datalen, &cdatalen);

 
                ri->magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
                ri->nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE);
 
                ri->magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
                ri->nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE);


@@ -403,14 +348,14 @@ int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                ri->offset = cpu_to_je32(offset);
                ri->csize = cpu_to_je32(cdatalen);
                ri->dsize = cpu_to_je32(datalen);
                ri->offset = cpu_to_je32(offset);
                ri->csize = cpu_to_je32(cdatalen);
                ri->dsize = cpu_to_je32(datalen);

-               ri->compr = comprtype;
+               ri->compr = comprtype & 0xff;
+               ri->usercompr = (comprtype >> 8 ) & 0xff;

                ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));
                ri->data_crc = cpu_to_je32(crc32(0, comprbuf, cdatalen));
 
                ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));
                ri->data_crc = cpu_to_je32(crc32(0, comprbuf, cdatalen));
 

-               fn = jffs2_write_dnode(c, f, ri, comprbuf, cdatalen, phys_ofs, ALLOC_NORETRY);
+               fn = jffs2_write_dnode(c, f, ri, comprbuf, cdatalen, ALLOC_NORETRY);

 
 

-               if (comprtype != JFFS2_COMPR_NONE)
-                       kfree(comprbuf);
+               jffs2_free_comprbuf(comprbuf, buf);

 
                if (IS_ERR(fn)) {
                        ret = PTR_ERR(fn);
 
                if (IS_ERR(fn)) {
                        ret = PTR_ERR(fn);


@@ -462,13 +407,14 @@ int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, str
        struct jffs2_raw_dirent *rd;
        struct jffs2_full_dnode *fn;
        struct jffs2_full_dirent *fd;
        struct jffs2_raw_dirent *rd;
        struct jffs2_full_dnode *fn;
        struct jffs2_full_dirent *fd;

-       uint32_t alloclen, phys_ofs;
+       uint32_t alloclen;

        int ret;
 
        int ret;
 

-       /* Try to reserve enough space for both node and dirent. 
-        * Just the node will do for now, though 
+       /* Try to reserve enough space for both node and dirent.
+        * Just the node will do for now, though

         */
         */

-       ret = jffs2_reserve_space(c, sizeof(*ri), &phys_ofs, &alloclen, ALLOC_NORMAL);
+       ret = jffs2_reserve_space(c, sizeof(*ri), &alloclen, ALLOC_NORMAL,
+                               JFFS2_SUMMARY_INODE_SIZE);

        D1(printk(KERN_DEBUG "jffs2_do_create(): reserved 0x%x bytes\n", alloclen));
        if (ret) {
                up(&f->sem);
        D1(printk(KERN_DEBUG "jffs2_do_create(): reserved 0x%x bytes\n", alloclen));
        if (ret) {
                up(&f->sem);


@@ -478,7 +424,7 @@ int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, str
        ri->data_crc = cpu_to_je32(0);
        ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));
 
        ri->data_crc = cpu_to_je32(0);
        ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));
 

-       fn = jffs2_write_dnode(c, f, ri, NULL, 0, phys_ofs, ALLOC_NORMAL);
+       fn = jffs2_write_dnode(c, f, ri, NULL, 0, ALLOC_NORMAL);

 
        D1(printk(KERN_DEBUG "jffs2_do_create created file with mode 0x%x\n",
                  jemode_to_cpu(ri->mode)));
 
        D1(printk(KERN_DEBUG "jffs2_do_create created file with mode 0x%x\n",
                  jemode_to_cpu(ri->mode)));


@@ -490,15 +436,16 @@ int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, str
                jffs2_complete_reservation(c);
                return PTR_ERR(fn);
        }
                jffs2_complete_reservation(c);
                return PTR_ERR(fn);
        }

-       /* No data here. Only a metadata node, which will be 
+       /* No data here. Only a metadata node, which will be

           obsoleted by the first data write
        */
        f->metadata = fn;
 
        up(&f->sem);
        jffs2_complete_reservation(c);
           obsoleted by the first data write
        */
        f->metadata = fn;
 
        up(&f->sem);
        jffs2_complete_reservation(c);

-       ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &phys_ofs, &alloclen, ALLOC_NORMAL);
-               
+       ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &alloclen,
+                               ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));
+

        if (ret) {
                /* Eep. */
                D1(printk(KERN_DEBUG "jffs2_reserve_space() for dirent failed\n"));
        if (ret) {
                /* Eep. */
                D1(printk(KERN_DEBUG "jffs2_reserve_space() for dirent failed\n"));


@@ -528,12 +475,12 @@ int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, str
        rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));
        rd->name_crc = cpu_to_je32(crc32(0, name, namelen));
 
        rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));
        rd->name_crc = cpu_to_je32(crc32(0, name, namelen));
 

-       fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, phys_ofs, ALLOC_NORMAL);
+       fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, ALLOC_NORMAL);

 
        jffs2_free_raw_dirent(rd);
 
        jffs2_free_raw_dirent(rd);

-       
+

        if (IS_ERR(fd)) {
        if (IS_ERR(fd)) {

-               /* dirent failed to write. Delete the inode normally 
+               /* dirent failed to write. Delete the inode normally

                   as if it were the final unlink() */
                jffs2_complete_reservation(c);
                up(&dir_f->sem);
                   as if it were the final unlink() */
                jffs2_complete_reservation(c);
                up(&dir_f->sem);


@@ -552,76 +499,108 @@ int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, str
 
 
 int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,
 
 
 int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,

-                   const char *name, int namelen, struct jffs2_inode_info *dead_f)
+                   const char *name, int namelen, struct jffs2_inode_info *dead_f,
+                   uint32_t time)

 {
        struct jffs2_raw_dirent *rd;
        struct jffs2_full_dirent *fd;
 {
        struct jffs2_raw_dirent *rd;
        struct jffs2_full_dirent *fd;

-       uint32_t alloclen, phys_ofs;
+       uint32_t alloclen;

        int ret;
 
        int ret;
 

-       rd = jffs2_alloc_raw_dirent();
-       if (!rd)
-               return -ENOMEM;
+       if (1 /* alternative branch needs testing */ ||
+           !jffs2_can_mark_obsolete(c)) {
+               /* We can't mark stuff obsolete on the medium. We need to write a deletion dirent */
+
+               rd = jffs2_alloc_raw_dirent();
+               if (!rd)
+                       return -ENOMEM;
+
+               ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &alloclen,
+                                       ALLOC_DELETION, JFFS2_SUMMARY_DIRENT_SIZE(namelen));
+               if (ret) {
+                       jffs2_free_raw_dirent(rd);
+                       return ret;
+               }
+
+               down(&dir_f->sem);
+
+               /* Build a deletion node */
+               rd->magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
+               rd->nodetype = cpu_to_je16(JFFS2_NODETYPE_DIRENT);
+               rd->totlen = cpu_to_je32(sizeof(*rd) + namelen);
+               rd->hdr_crc = cpu_to_je32(crc32(0, rd, sizeof(struct jffs2_unknown_node)-4));
+
+               rd->pino = cpu_to_je32(dir_f->inocache->ino);
+               rd->version = cpu_to_je32(++dir_f->highest_version);
+               rd->ino = cpu_to_je32(0);
+               rd->mctime = cpu_to_je32(time);
+               rd->nsize = namelen;
+               rd->type = DT_UNKNOWN;
+               rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));
+               rd->name_crc = cpu_to_je32(crc32(0, name, namelen));
+
+               fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, ALLOC_DELETION);

 
 

-       ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &phys_ofs, &alloclen, ALLOC_DELETION);
-       if (ret) {

                jffs2_free_raw_dirent(rd);
                jffs2_free_raw_dirent(rd);

-               return ret;
-       }

 
 

-       down(&dir_f->sem);
+               if (IS_ERR(fd)) {
+                       jffs2_complete_reservation(c);
+                       up(&dir_f->sem);
+                       return PTR_ERR(fd);
+               }

 
 

-       /* Build a deletion node */
-       rd->magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
-       rd->nodetype = cpu_to_je16(JFFS2_NODETYPE_DIRENT);
-       rd->totlen = cpu_to_je32(sizeof(*rd) + namelen);
-       rd->hdr_crc = cpu_to_je32(crc32(0, rd, sizeof(struct jffs2_unknown_node)-4));
+               /* File it. This will mark the old one obsolete. */
+               jffs2_add_fd_to_list(c, fd, &dir_f->dents);
+               up(&dir_f->sem);
+       } else {
+               struct jffs2_full_dirent **prev = &dir_f->dents;
+               uint32_t nhash = full_name_hash(name, namelen);

 
 

-       rd->pino = cpu_to_je32(dir_f->inocache->ino);
-       rd->version = cpu_to_je32(++dir_f->highest_version);
-       rd->ino = cpu_to_je32(0);
-       rd->mctime = cpu_to_je32(get_seconds());
-       rd->nsize = namelen;
-       rd->type = DT_UNKNOWN;
-       rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));
-       rd->name_crc = cpu_to_je32(crc32(0, name, namelen));
+               down(&dir_f->sem);

 
 

-       fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, phys_ofs, ALLOC_DELETION);
-       
-       jffs2_free_raw_dirent(rd);
+               while ((*prev) && (*prev)->nhash <= nhash) {
+                       if ((*prev)->nhash == nhash &&
+                           !memcmp((*prev)->name, name, namelen) &&
+                           !(*prev)->name[namelen]) {
+                               struct jffs2_full_dirent *this = *prev;

 
 

-       if (IS_ERR(fd)) {
-               jffs2_complete_reservation(c);
+                               D1(printk(KERN_DEBUG "Marking old dirent node (ino #%u) @%08x obsolete\n",
+                                         this->ino, ref_offset(this->raw)));
+
+                               *prev = this->next;
+                               jffs2_mark_node_obsolete(c, (this->raw));
+                               jffs2_free_full_dirent(this);
+                               break;
+                       }
+                       prev = &((*prev)->next);
+               }

                up(&dir_f->sem);
                up(&dir_f->sem);

-               return PTR_ERR(fd);

        }
 
        }
 

-       /* File it. This will mark the old one obsolete. */
-       jffs2_add_fd_to_list(c, fd, &dir_f->dents);
-
-       up(&dir_f->sem);
-       

        /* dead_f is NULL if this was a rename not a real unlink */
        /* Also catch the !f->inocache case, where there was a dirent
           pointing to an inode which didn't exist. */
        /* dead_f is NULL if this was a rename not a real unlink */
        /* Also catch the !f->inocache case, where there was a dirent
           pointing to an inode which didn't exist. */

-       if (dead_f && dead_f->inocache) { 
+       if (dead_f && dead_f->inocache) {

 
                down(&dead_f->sem);
 
 
                down(&dead_f->sem);
 

-               while (dead_f->dents) {
-                       /* There can be only deleted ones */
-                       fd = dead_f->dents;
-                       
-                       dead_f->dents = fd->next;
-                       
-                       if (fd->ino) {
-                               printk(KERN_WARNING "Deleting inode #%u with active dentry \"%s\"->ino #%u\n",
-                                      dead_f->inocache->ino, fd->name, fd->ino);
-                       } else {
-                               D1(printk(KERN_DEBUG "Removing deletion dirent for \"%s\" from dir ino #%u\n", fd->name, dead_f->inocache->ino));
+               if (S_ISDIR(OFNI_EDONI_2SFFJ(dead_f)->i_mode)) {
+                       while (dead_f->dents) {
+                               /* There can be only deleted ones */
+                               fd = dead_f->dents;
+
+                               dead_f->dents = fd->next;
+
+                               if (fd->ino) {
+                                       printk(KERN_WARNING "Deleting inode #%u with active dentry \"%s\"->ino #%u\n",
+                                              dead_f->inocache->ino, fd->name, fd->ino);
+                               } else {
+                                       D1(printk(KERN_DEBUG "Removing deletion dirent for \"%s\" from dir ino #%u\n",
+                                               fd->name, dead_f->inocache->ino));
+                               }
+                               jffs2_mark_node_obsolete(c, fd->raw);
+                               jffs2_free_full_dirent(fd);

                        }
                        }

-                       jffs2_mark_node_obsolete(c, fd->raw);
-                       jffs2_free_full_dirent(fd);

                }
 
                dead_f->inocache->nlink--;
                }
 
                dead_f->inocache->nlink--;


@@ -635,23 +614,24 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,
 }
 
 
 }
 
 

-int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint32_t ino, uint8_t type, const char *name, int namelen)
+int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint32_t ino, uint8_t type, const char *name, int namelen, uint32_t time)

 {
        struct jffs2_raw_dirent *rd;
        struct jffs2_full_dirent *fd;
 {
        struct jffs2_raw_dirent *rd;
        struct jffs2_full_dirent *fd;

-       uint32_t alloclen, phys_ofs;
+       uint32_t alloclen;

        int ret;
 
        rd = jffs2_alloc_raw_dirent();
        if (!rd)
                return -ENOMEM;
 
        int ret;
 
        rd = jffs2_alloc_raw_dirent();
        if (!rd)
                return -ENOMEM;
 

-       ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &phys_ofs, &alloclen, ALLOC_NORMAL);
+       ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &alloclen,
+                               ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));

        if (ret) {
                jffs2_free_raw_dirent(rd);
                return ret;
        }
        if (ret) {
                jffs2_free_raw_dirent(rd);
                return ret;
        }

-       
+

        down(&dir_f->sem);
 
        /* Build a deletion node */
        down(&dir_f->sem);
 
        /* Build a deletion node */


@@ -663,7 +643,7 @@ int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint
        rd->pino = cpu_to_je32(dir_f->inocache->ino);
        rd->version = cpu_to_je32(++dir_f->highest_version);
        rd->ino = cpu_to_je32(ino);
        rd->pino = cpu_to_je32(dir_f->inocache->ino);
        rd->version = cpu_to_je32(++dir_f->highest_version);
        rd->ino = cpu_to_je32(ino);

-       rd->mctime = cpu_to_je32(get_seconds());
+       rd->mctime = cpu_to_je32(time);

        rd->nsize = namelen;
 
        rd->type = type;
        rd->nsize = namelen;
 
        rd->type = type;


@@ -671,8 +651,8 @@ int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint
        rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));
        rd->name_crc = cpu_to_je32(crc32(0, name, namelen));
 
        rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));
        rd->name_crc = cpu_to_je32(crc32(0, name, namelen));
 

-       fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, phys_ofs, ALLOC_NORMAL);
-       
+       fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, ALLOC_NORMAL);
+

        jffs2_free_raw_dirent(rd);
 
        if (IS_ERR(fd)) {
        jffs2_free_raw_dirent(rd);
 
        if (IS_ERR(fd)) {