Merge ../linux-2.6-watchdog-mm

[linux-2.6-omap-h63xx.git] / fs / jffs2 / xattr.h

diff --git a/fs/jffs2/xattr.h b/fs/jffs2/xattr.h
index 06ab7b8802126bdc5a5209372e208797f876dc10..06a5c69dcf8b1052d3dd8177d19a90198b9e284c 100644 (file)
--- a/fs/jffs2/xattr.h
+++ b/fs/jffs2/xattr.h
@@ -16,6 +16,7 @@
 
 #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
@@ -27,7 +28,7 @@ struct jffs2_xattr_datum
        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;
 
@@ -60,34 +61,12 @@ struct jffs2_xattr_ref
        struct jffs2_xattr_ref *next;           /* chained from ic->xref_list */
 };
 
-#define XDATUM_DELETE_MARKER   (0xffffffff)
 #define XREF_DELETE_MARKER     (0x00000001)
-static inline int is_xattr_datum_dead(struct jffs2_xattr_datum *xd)
-{
-       return (xd->version == XDATUM_DELETE_MARKER);
-}
-
-static inline void set_xattr_datum_dead(struct jffs2_xattr_datum *xd)
-{
-       xd->version = XDATUM_DELETE_MARKER;
-}
-
 static inline int is_xattr_ref_dead(struct jffs2_xattr_ref *ref)
 {
        return ((ref->xseqno & XREF_DELETE_MARKER) != 0);
 }
 
-static inline void set_xattr_ref_dead(struct jffs2_xattr_ref *ref)
-{
-       ref->xseqno |= XREF_DELETE_MARKER;
-}
-
-static inline void clr_xattr_ref_dead(struct jffs2_xattr_ref *ref)
-{
-       ref->xseqno &= ~XREF_DELETE_MARKER;
-}
-
-
 #ifdef CONFIG_JFFS2_FS_XATTR
 
 extern void jffs2_init_xattr_subsystem(struct jffs2_sb_info *c);