[JFFS2][XATTR] Re-define xd->refcnt as atomic_t

[pandora-kernel.git] / fs / jffs2 / xattr.h

diff --git a/fs/jffs2/xattr.h b/fs/jffs2/xattr.h
index d157ad6..06a5c69 100644 (file)
--- a/fs/jffs2/xattr.h
+++ b/fs/jffs2/xattr.h
@@ -1,31 +1,34 @@
-/*-------------------------------------------------------------------------*
- *  File: fs/jffs2/xattr.c
- *  XATTR support on JFFS2 FileSystem
+/*
+ * JFFS2 -- Journalling Flash File System, Version 2.
  *
- *  Implemented by KaiGai Kohei <kaigai@ak.jp.nec.com>
- *  Copyright (C) 2006 NEC Corporation
+ * Copyright (C) 2006  NEC Corporation
  *
- *  For licensing information, see the file 'LICENCE' in the jffs2 directory.
- *-------------------------------------------------------------------------*/
-
+ * Created by KaiGai Kohei <kaigai@ak.jp.nec.com>
+ *
+ * For licensing information, see the file 'LICENCE' in this directory.
+ *
+ */
 #ifndef _JFFS2_FS_XATTR_H_
 #define _JFFS2_FS_XATTR_H_
 
 #include <linux/xattr.h>
+#include <linux/list.h>
 
 #define JFFS2_XFLAGS_HOT       (0x01)  /* This datum is HOT */
 #define JFFS2_XFLAGS_BIND      (0x02)  /* This datum is not reclaimed */
+#define JFFS2_XFLAGS_DEAD      (0x40)  /* This datum is already dead */
+#define JFFS2_XFLAGS_INVALID   (0x80)  /* This datum contains crc error */
 
 struct jffs2_xattr_datum
 {
        void *always_null;
-       u8 class;
-       u8 flags;
-       u16 xprefix;                    /* see JFFS2_XATTR_PREFIX_* */
-
        struct jffs2_raw_node_ref *node;
+       uint8_t class;
+       uint8_t flags;
+       uint16_t xprefix;               /* see JFFS2_XATTR_PREFIX_* */
+
        struct list_head xindex;        /* chained from c->xattrindex[n] */
-       uint32_t refcnt;                /* # of xattr_ref refers this */
+       atomic_t refcnt;                /* # of xattr_ref refers this */
        uint32_t xid;
        uint32_t version;
 
@@ -37,15 +40,16 @@ struct jffs2_xattr_datum
        uint32_t value_len;     /* length of xvalue */
 };
 
-struct jffs2_inode_cache;      /* forward refence */
+struct jffs2_inode_cache;
 struct jffs2_xattr_ref
 {
        void *always_null;
-       u8 class;
-       u8 flags;               /* Currently unused */
+       struct jffs2_raw_node_ref *node;
+       uint8_t class;
+       uint8_t flags;          /* Currently unused */
        u16 unused;
 
-       struct jffs2_raw_node_ref *node;
+       uint32_t xseqno;
        union {
                struct jffs2_inode_cache *ic;   /* reference to jffs2_inode_cache */
                uint32_t ino;                   /* only used in scanning/building  */
@@ -54,9 +58,15 @@ struct jffs2_xattr_ref
                struct jffs2_xattr_datum *xd;   /* reference to jffs2_xattr_datum */
                uint32_t xid;                   /* only used in sccanning/building */
        };
-       struct list_head ilist;                 /* chained from ic->ilist */
+       struct jffs2_xattr_ref *next;           /* chained from ic->xref_list */
 };
 
+#define XREF_DELETE_MARKER     (0x00000001)
+static inline int is_xattr_ref_dead(struct jffs2_xattr_ref *ref)
+{
+       return ((ref->xseqno & XREF_DELETE_MARKER) != 0);
+}
+
 #ifdef CONFIG_JFFS2_FS_XATTR
 
 extern void jffs2_init_xattr_subsystem(struct jffs2_sb_info *c);
@@ -69,8 +79,13 @@ extern struct jffs2_xattr_datum *jffs2_setup_xattr_datum(struct jffs2_sb_info *c
 extern void jffs2_xattr_delete_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic);
 extern void jffs2_xattr_free_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic);
 
-extern int jffs2_garbage_collect_xattr(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic);
+extern int jffs2_garbage_collect_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd,
+                                            struct jffs2_raw_node_ref *raw);
+extern int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref,
+                                          struct jffs2_raw_node_ref *raw);
 extern int jffs2_verify_xattr(struct jffs2_sb_info *c);
+extern void jffs2_release_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd);
+extern void jffs2_release_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref);
 
 extern int do_jffs2_getxattr(struct inode *inode, int xprefix, const char *xname,
                             char *buffer, size_t size);
@@ -86,9 +101,6 @@ extern ssize_t jffs2_listxattr(struct dentry *, char *, size_t);
 #define jffs2_setxattr         generic_setxattr
 #define jffs2_removexattr      generic_removexattr
 
-/*---- Any inline initialize functions ----*/
-#define init_xattr_inode_cache(x) INIT_LIST_HEAD(&((x)->ilist))
-
 #else
 
 #define jffs2_init_xattr_subsystem(c)
@@ -97,7 +109,6 @@ extern ssize_t jffs2_listxattr(struct dentry *, char *, size_t);
 
 #define jffs2_xattr_delete_inode(c, ic)
 #define jffs2_xattr_free_inode(c, ic)
-#define jffs2_garbage_collect_xattr(c, ic)     (1)
 #define jffs2_verify_xattr(c)                  (1)
 
 #define jffs2_xattr_handlers   NULL
@@ -106,8 +117,6 @@ extern ssize_t jffs2_listxattr(struct dentry *, char *, size_t);
 #define jffs2_setxattr         NULL
 #define jffs2_removexattr      NULL
 
-#define init_xattr_inode_cache(x)
-
 #endif /* CONFIG_JFFS2_FS_XATTR */
 
 #ifdef CONFIG_JFFS2_FS_SECURITY