[JFFS2] Deletion dirents should be REF_NORMAL, not REF_PRISTINE.
Otherwise they'll never actually get garbage-collected. Noted by Jonathan Larmour. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
parent
5bd5c03c31
commit
71c2339775
|
@ -139,6 +139,11 @@ static inline struct jffs2_inode_cache *jffs2_raw_ref_to_ic(struct jffs2_raw_nod
|
||||||
#define ref_obsolete(ref) (((ref)->flash_offset & 3) == REF_OBSOLETE)
|
#define ref_obsolete(ref) (((ref)->flash_offset & 3) == REF_OBSOLETE)
|
||||||
#define mark_ref_normal(ref) do { (ref)->flash_offset = ref_offset(ref) | REF_NORMAL; } while(0)
|
#define mark_ref_normal(ref) do { (ref)->flash_offset = ref_offset(ref) | REF_NORMAL; } while(0)
|
||||||
|
|
||||||
|
/* Dirent nodes should be REF_PRISTINE only if they are not a deletion
|
||||||
|
dirent. Deletion dirents should be REF_NORMAL so that GC gets to
|
||||||
|
throw them away when appropriate */
|
||||||
|
#define dirent_node_state(rd) ( (je32_to_cpu((rd)->ino)?REF_PRISTINE:REF_NORMAL) )
|
||||||
|
|
||||||
/* NB: REF_PRISTINE for an inode-less node (ref->next_in_ino == NULL) indicates
|
/* NB: REF_PRISTINE for an inode-less node (ref->next_in_ino == NULL) indicates
|
||||||
it is an unknown node of type JFFS2_NODETYPE_RWCOMPAT_COPY, so it'll get
|
it is an unknown node of type JFFS2_NODETYPE_RWCOMPAT_COPY, so it'll get
|
||||||
copied. If you need to do anything different to GC inode-less nodes, then
|
copied. If you need to do anything different to GC inode-less nodes, then
|
||||||
|
|
|
@ -613,7 +613,7 @@ static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_r
|
||||||
jeb->unchecked_size -= len;
|
jeb->unchecked_size -= len;
|
||||||
c->used_size += len;
|
c->used_size += len;
|
||||||
c->unchecked_size -= len;
|
c->unchecked_size -= len;
|
||||||
ref->flash_offset = ref_offset(ref) | REF_PRISTINE;
|
ref->flash_offset = ref_offset(ref) | dirent_node_state(rd);
|
||||||
spin_unlock(&c->erase_completion_lock);
|
spin_unlock(&c->erase_completion_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1049,7 +1049,8 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
fd->raw = jffs2_link_node_ref(c, jeb, ofs | REF_PRISTINE, PAD(je32_to_cpu(rd->totlen)), ic);
|
fd->raw = jffs2_link_node_ref(c, jeb, ofs | dirent_node_state(rd),
|
||||||
|
PAD(je32_to_cpu(rd->totlen)), ic);
|
||||||
|
|
||||||
fd->next = NULL;
|
fd->next = NULL;
|
||||||
fd->version = je32_to_cpu(rd->version);
|
fd->version = je32_to_cpu(rd->version);
|
||||||
|
|
|
@ -296,7 +296,8 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff
|
||||||
return ERR_PTR(ret?ret:-EIO);
|
return ERR_PTR(ret?ret:-EIO);
|
||||||
}
|
}
|
||||||
/* Mark the space used */
|
/* Mark the space used */
|
||||||
fd->raw = jffs2_add_physical_node_ref(c, flash_ofs | REF_PRISTINE, PAD(sizeof(*rd)+namelen), f->inocache);
|
fd->raw = jffs2_add_physical_node_ref(c, flash_ofs | dirent_node_state(rd),
|
||||||
|
PAD(sizeof(*rd)+namelen), f->inocache);
|
||||||
if (IS_ERR(fd->raw)) {
|
if (IS_ERR(fd->raw)) {
|
||||||
void *hold_err = fd->raw;
|
void *hold_err = fd->raw;
|
||||||
/* Release the full_dirent which is now useless, and return */
|
/* Release the full_dirent which is now useless, and return */
|
||||||
|
|
Loading…
Reference in a new issue