Merge branch 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird

[~andy/linux] / fs / jffs2 / jffs2_fs_sb.h

diff --git a/fs/jffs2/jffs2_fs_sb.h b/fs/jffs2/jffs2_fs_sb.h
index 4bcfb5570221a6fe7e1fa4347c9f5e78f6fc3b68..b98594992eed530a7431a8db7c85f104ba734d73 100644 (file)
--- a/fs/jffs2/jffs2_fs_sb.h
+++ b/fs/jffs2/jffs2_fs_sb.h
@@ -100,6 +100,7 @@ struct jffs2_sb_info {
 #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
        /* Write-behind buffer for NAND flash */
        unsigned char *wbuf;
+       unsigned char *oobbuf;
        uint32_t wbuf_ofs;
        uint32_t wbuf_len;
        struct jffs2_inodirty *wbuf_inodes;
@@ -107,7 +108,7 @@ struct jffs2_sb_info {
        struct rw_semaphore wbuf_sem;   /* Protects the write buffer */
 
        /* Information about out-of-band area usage... */
-       struct nand_oobinfo *oobinfo;
+       struct nand_ecclayout *ecclayout;
        uint32_t badblock_pos;
        uint32_t fsdata_pos;
        uint32_t fsdata_len;
@@ -115,6 +116,19 @@ struct jffs2_sb_info {
 
        struct jffs2_summary *summary;          /* Summary information */
 
+#ifdef CONFIG_JFFS2_FS_XATTR
+#define XATTRINDEX_HASHSIZE    (57)
+       uint32_t highest_xid;
+       uint32_t highest_xseqno;
+       struct list_head xattrindex[XATTRINDEX_HASHSIZE];
+       struct list_head xattr_unchecked;
+       struct list_head xattr_dead_list;
+       struct jffs2_xattr_ref *xref_dead_list;
+       struct jffs2_xattr_ref *xref_temp;
+       struct rw_semaphore xattr_sem;
+       uint32_t xdatum_mem_usage;
+       uint32_t xdatum_mem_threshold;
+#endif
        /* OS-private pointer for getting back to master superblock info */
        void *os_priv;
 };