parisc: types: use <asm-generic/int-*.h> for the parisc architecture

[linux-2.6-omap-h63xx.git] / include / linux / reiserfs_fs_sb.h

diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index ff9e9234f8ba64b77f2b7316e34fc69781919e2f..336ee43ed7d8897eb9a1b4c7453123bf7ab3ebc8 100644 (file)
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -177,7 +177,6 @@ struct reiserfs_journal {
        struct reiserfs_journal_cnode *j_last;  /* newest journal block */
        struct reiserfs_journal_cnode *j_first; /*  oldest journal block.  start here for traverse */
 
-       struct file *j_dev_file;
        struct block_device *j_dev_bd;
        int j_1st_reserved_block;       /* first block on s_dev of reserved area journal */
 
@@ -185,7 +184,7 @@ struct reiserfs_journal {
        unsigned long j_trans_id;
        unsigned long j_mount_id;
        unsigned long j_start;  /* start of current waiting commit (index into j_ap_blocks) */
-       unsigned long j_len;    /* lenght of current waiting commit */
+       unsigned long j_len;    /* length of current waiting commit */
        unsigned long j_len_alloc;      /* number of buffers requested by journal_begin() */
        atomic_t j_wcount;      /* count of writers for current commit */
        unsigned long j_bcount; /* batch count. allows turning X transactions into 1 */
@@ -265,9 +264,7 @@ enum journal_state_bits {
 typedef __u32(*hashf_t) (const signed char *, int);
 
 struct reiserfs_bitmap_info {
-       // FIXME: Won't work with block sizes > 8K
-       __u16 first_zero_hint;
-       __u16 free_count;
+       __u32 free_count;
 };
 
 struct proc_dir_entry;