Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / linux / jffs2_fs_sb.h

diff --git a/fs/jffs2/jffs2_fs_sb.h b/include/linux/jffs2_fs_sb.h
similarity index 90%
rename from fs/jffs2/jffs2_fs_sb.h
rename to include/linux/jffs2_fs_sb.h
index b985949..4bcfb55 100644 (file)
--- a/fs/jffs2/jffs2_fs_sb.h
+++ b/include/linux/jffs2_fs_sb.h
@@ -100,7 +100,6 @@ 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;
@@ -108,7 +107,7 @@ struct jffs2_sb_info {
        struct rw_semaphore wbuf_sem;   /* Protects the write buffer */
 
        /* Information about out-of-band area usage... */
-       struct nand_ecclayout *ecclayout;
+       struct nand_oobinfo *oobinfo;
        uint32_t badblock_pos;
        uint32_t fsdata_pos;
        uint32_t fsdata_len;
@@ -116,19 +115,6 @@ 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;
 };