#ifndef __JFFS2_NODELIST_H__
#define __JFFS2_NODELIST_H__
+#include <linux/config.h>
#include <linux/fs.h>
#include <linux/types.h>
#include <linux/jffs2.h>
-#include "jffs2_fs_sb.h"
-#include "jffs2_fs_i.h"
-#include "xattr.h"
-#include "acl.h"
+#include <linux/jffs2_fs_sb.h>
+#include <linux/jffs2_fs_i.h>
#include "summary.h"
#ifdef __ECOS
struct jffs2_raw_node_ref
{
struct jffs2_raw_node_ref *next_in_ino; /* Points to the next raw_node_ref
- for this object. If this _is_ the last, it points to the inode_cache,
- xattr_ref or xattr_datum instead. The common part of those structures
- has NULL in the first word. See jffs2_raw_ref_to_ic() below */
+ for this inode. If this is the last, it points to the inode_cache
+ for this inode instead. The inode_cache will have NULL in the first
+ word so you know when you've got there :) */
+ struct jffs2_raw_node_ref *next_phys;
uint32_t flash_offset;
-#define TEST_TOTLEN
-#ifdef TEST_TOTLEN
uint32_t __totlen; /* This may die; use ref_totlen(c, jeb, ) below */
-#endif
};
-#define REF_LINK_NODE ((int32_t)-1)
-#define REF_EMPTY_NODE ((int32_t)-2)
-
-/* Use blocks of about 256 bytes */
-#define REFS_PER_BLOCK ((255/sizeof(struct jffs2_raw_node_ref))-1)
-
-static inline struct jffs2_raw_node_ref *ref_next(struct jffs2_raw_node_ref *ref)
-{
- ref++;
-
- /* Link to another block of refs */
- if (ref->flash_offset == REF_LINK_NODE) {
- ref = ref->next_in_ino;
- if (!ref)
- return ref;
- }
-
- /* End of chain */
- if (ref->flash_offset == REF_EMPTY_NODE)
- return NULL;
-
- return ref;
-}
-
-static inline struct jffs2_inode_cache *jffs2_raw_ref_to_ic(struct jffs2_raw_node_ref *raw)
-{
- while(raw->next_in_ino)
- raw = raw->next_in_ino;
-
- /* NB. This can be a jffs2_xattr_datum or jffs2_xattr_ref and
- not actually a jffs2_inode_cache. Check ->class */
- return ((struct jffs2_inode_cache *)raw);
-}
-
/* flash_offset & 3 always has to be zero, because nodes are
always aligned at 4 bytes. So we have a couple of extra bits
to play with, which indicate the node's status; see below: */
#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)
-/* 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
- copied. If you need to do anything different to GC inode-less nodes, then
- you need to modify gc.c accordingly. */
-
/* For each inode in the filesystem, we need to keep a record of
nlink, because it would be a PITA to scan the whole directory tree
at read_inode() time to calculate it, and to keep sufficient information
a pointer to the first physical node which is part of this inode, too.
*/
struct jffs2_inode_cache {
- /* First part of structure is shared with other objects which
- can terminate the raw node refs' next_in_ino list -- which
- currently struct jffs2_xattr_datum and struct jffs2_xattr_ref. */
-
struct jffs2_full_dirent *scan_dents; /* Used during scan to hold
temporary lists of dirents, and later must be set to
NULL to mark the end of the raw_node_ref->next_in_ino
chain. */
+ struct jffs2_inode_cache *next;
struct jffs2_raw_node_ref *nodes;
- uint8_t class; /* It's used for identification */
-
- /* end of shared structure */
-
- uint8_t flags;
- uint16_t state;
uint32_t ino;
- struct jffs2_inode_cache *next;
-#ifdef CONFIG_JFFS2_FS_XATTR
- struct jffs2_xattr_ref *xref;
-#endif
int nlink;
+ int state;
};
/* Inode states for 'state' above. We need the 'GC' state to prevent
#define INO_STATE_READING 5 /* In read_inode() */
#define INO_STATE_CLEARING 6 /* In clear_inode() */
-#define INO_FLAGS_XATTR_CHECKED 0x01 /* has no duplicate xattr_ref */
-
-#define RAWNODE_CLASS_INODE_CACHE 0
-#define RAWNODE_CLASS_XATTR_DATUM 1
-#define RAWNODE_CLASS_XATTR_REF 2
-
#define INOCACHE_HASHSIZE 128
-#define write_ofs(c) ((c)->nextblock->offset + (c)->sector_size - (c)->nextblock->free_size)
-
/*
Larger representation of a raw node, kept in-core only when the
struct inode for this particular ino is instantiated.
uint32_t wasted_size;
uint32_t free_size; /* Note that sector_size - free_size
is the address of the first free space */
- uint32_t allocated_refs;
struct jffs2_raw_node_ref *first_node;
struct jffs2_raw_node_ref *last_node;
return ((c->flash_size / c->sector_size) * sizeof (struct jffs2_eraseblock)) > (128 * 1024);
}
-#define ref_totlen(a, b, c) __jffs2_ref_totlen((a), (b), (c))
+/* Calculate totlen from surrounding nodes or eraseblock */
+static inline uint32_t __ref_totlen(struct jffs2_sb_info *c,
+ struct jffs2_eraseblock *jeb,
+ struct jffs2_raw_node_ref *ref)
+{
+ uint32_t ref_end;
+
+ if (ref->next_phys)
+ ref_end = ref_offset(ref->next_phys);
+ else {
+ if (!jeb)
+ jeb = &c->blocks[ref->flash_offset / c->sector_size];
+
+ /* Last node in block. Use free_space */
+ BUG_ON(ref != jeb->last_node);
+ ref_end = jeb->offset + c->sector_size - jeb->free_size;
+ }
+ return ref_end - ref_offset(ref);
+}
+
+static inline uint32_t ref_totlen(struct jffs2_sb_info *c,
+ struct jffs2_eraseblock *jeb,
+ struct jffs2_raw_node_ref *ref)
+{
+ uint32_t ret;
+
+#if CONFIG_JFFS2_FS_DEBUG > 0
+ if (jeb && jeb != &c->blocks[ref->flash_offset / c->sector_size]) {
+ printk(KERN_CRIT "ref_totlen called with wrong block -- at 0x%08x instead of 0x%08x; ref 0x%08x\n",
+ jeb->offset, c->blocks[ref->flash_offset / c->sector_size].offset, ref_offset(ref));
+ BUG();
+ }
+#endif
+
+#if 1
+ ret = ref->__totlen;
+#else
+ /* This doesn't actually work yet */
+ ret = __ref_totlen(c, jeb, ref);
+ if (ret != ref->__totlen) {
+ printk(KERN_CRIT "Totlen for ref at %p (0x%08x-0x%08x) miscalculated as 0x%x instead of %x\n",
+ ref, ref_offset(ref), ref_offset(ref)+ref->__totlen,
+ ret, ref->__totlen);
+ if (!jeb)
+ jeb = &c->blocks[ref->flash_offset / c->sector_size];
+ jffs2_dbg_dump_node_refs_nolock(c, jeb);
+ BUG();
+ }
+#endif
+ return ret;
+}
#define ALLOC_NORMAL 0 /* Normal allocation */
#define ALLOC_DELETION 1 /* Deletion node. Best to allow it */
#define PAD(x) (((x)+3)&~3)
-static inline int jffs2_encode_dev(union jffs2_device_node *jdev, dev_t rdev)
+static inline struct jffs2_inode_cache *jffs2_raw_ref_to_ic(struct jffs2_raw_node_ref *raw)
{
- if (old_valid_dev(rdev)) {
- jdev->old = cpu_to_je16(old_encode_dev(rdev));
- return sizeof(jdev->old);
- } else {
- jdev->new = cpu_to_je32(new_encode_dev(rdev));
- return sizeof(jdev->new);
+ while(raw->next_in_ino) {
+ raw = raw->next_in_ino;
}
+
+ return ((struct jffs2_inode_cache *)raw);
}
static inline struct jffs2_node_frag *frag_first(struct rb_root *root)
return rb_entry(node, struct jffs2_node_frag, rb);
}
+#define rb_parent(rb) ((rb)->rb_parent)
#define frag_next(frag) rb_entry(rb_next(&(frag)->rb), struct jffs2_node_frag, rb)
#define frag_prev(frag) rb_entry(rb_prev(&(frag)->rb), struct jffs2_node_frag, rb)
#define frag_parent(frag) rb_entry(rb_parent(&(frag)->rb), struct jffs2_node_frag, rb)
struct rb_node *rb_next(struct rb_node *);
struct rb_node *rb_prev(struct rb_node *);
void rb_replace_node(struct rb_node *victim, struct rb_node *new, struct rb_root *root);
+void jffs2_obsolete_node_frag(struct jffs2_sb_info *c, struct jffs2_node_frag *this);
int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_full_dnode *fn);
void jffs2_truncate_fragtree (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size);
int jffs2_add_older_frag_to_fragtree(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_tmp_dnode_info *tn);
-struct jffs2_raw_node_ref *jffs2_link_node_ref(struct jffs2_sb_info *c,
- struct jffs2_eraseblock *jeb,
- uint32_t ofs, uint32_t len,
- struct jffs2_inode_cache *ic);
-extern uint32_t __jffs2_ref_totlen(struct jffs2_sb_info *c,
- struct jffs2_eraseblock *jeb,
- struct jffs2_raw_node_ref *ref);
/* nodemgmt.c */
int jffs2_thread_should_wake(struct jffs2_sb_info *c);
-int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,
+int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs,
uint32_t *len, int prio, uint32_t sumsize);
-int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize,
+int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs,
uint32_t *len, uint32_t sumsize);
-struct jffs2_raw_node_ref *jffs2_add_physical_node_ref(struct jffs2_sb_info *c,
- uint32_t ofs, uint32_t len,
- struct jffs2_inode_cache *ic);
+int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *new);
void jffs2_complete_reservation(struct jffs2_sb_info *c);
void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *raw);
/* write.c */
int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint32_t mode, struct jffs2_raw_inode *ri);
-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_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_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_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);
int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
struct jffs2_raw_inode *ri, unsigned char *buf,
uint32_t offset, uint32_t writelen, uint32_t *retlen);
-int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, struct jffs2_inode_info *f,
- struct jffs2_raw_inode *ri, const char *name, int namelen);
-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, uint32_t time);
-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);
+int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, struct jffs2_inode_info *f, struct jffs2_raw_inode *ri, const char *name, int namelen);
+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, uint32_t time);
+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);
/* readinode.c */
void jffs2_free_raw_inode(struct jffs2_raw_inode *);
struct jffs2_tmp_dnode_info *jffs2_alloc_tmp_dnode_info(void);
void jffs2_free_tmp_dnode_info(struct jffs2_tmp_dnode_info *);
-int jffs2_prealloc_raw_node_refs(struct jffs2_sb_info *c,
- struct jffs2_eraseblock *jeb, int nr);
-void jffs2_free_refblock(struct jffs2_raw_node_ref *);
+struct jffs2_raw_node_ref *jffs2_alloc_raw_node_ref(void);
+void jffs2_free_raw_node_ref(struct jffs2_raw_node_ref *);
struct jffs2_node_frag *jffs2_alloc_node_frag(void);
void jffs2_free_node_frag(struct jffs2_node_frag *);
struct jffs2_inode_cache *jffs2_alloc_inode_cache(void);
void jffs2_free_inode_cache(struct jffs2_inode_cache *);
-#ifdef CONFIG_JFFS2_FS_XATTR
-struct jffs2_xattr_datum *jffs2_alloc_xattr_datum(void);
-void jffs2_free_xattr_datum(struct jffs2_xattr_datum *);
-struct jffs2_xattr_ref *jffs2_alloc_xattr_ref(void);
-void jffs2_free_xattr_ref(struct jffs2_xattr_ref *);
-#endif
/* gc.c */
int jffs2_garbage_collect_pass(struct jffs2_sb_info *c);
/* scan.c */
int jffs2_scan_medium(struct jffs2_sb_info *c);
void jffs2_rotate_lists(struct jffs2_sb_info *c);
+int jffs2_fill_scan_buf(struct jffs2_sb_info *c, void *buf,
+ uint32_t ofs, uint32_t len);
struct jffs2_inode_cache *jffs2_scan_make_ino_cache(struct jffs2_sb_info *c, uint32_t ino);
int jffs2_scan_classify_jeb(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
-int jffs2_scan_dirty_space(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb, uint32_t size);
/* build.c */
int jffs2_do_mount_fs(struct jffs2_sb_info *c);
/* erase.c */
void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count);
-void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
#ifdef CONFIG_JFFS2_FS_WRITEBUFFER
/* wbuf.c */
git://git.onelab.eu / linux-2.6.git / blobdiff