Commit c5182af6 authored by Hans Reiser's avatar Hans Reiser Committed by Linus Torvalds

[PATCH] reiserfs patchset, patch 9 of 9 09-64bit_bitops_fix-1.diff

09-64bit_bitops_fix-1.diff
    Bitopts arguments must be long, not int.
parent 52800f5c
......@@ -797,7 +797,7 @@ static void remove_all_from_journal_list(struct super_block *p_s_sb, struct reis
while(cn) {
if (cn->blocknr != 0) {
if (debug) {
printk("block %lu, bh is %d, state %d\n", cn->blocknr, cn->bh ? 1: 0,
printk("block %lu, bh is %d, state %ld\n", cn->blocknr, cn->bh ? 1: 0,
cn->state) ;
}
cn->state = 0 ;
......
......@@ -465,7 +465,7 @@ int reiserfs_journal_in_proc( char *buffer, char **start, off_t offset,
"jp_journal_max_trans_age: \t%i\n"
/* incore fields */
"j_1st_reserved_block: \t%i\n"
"j_state: \t%i\n"
"j_state: \t%li\n"
"j_trans_id: \t%lu\n"
"j_mount_id: \t%lu\n"
"j_start: \t%lu\n"
......
......@@ -131,7 +131,7 @@ struct reiserfs_journal_cnode {
struct buffer_head *bh ; /* real buffer head */
struct super_block *sb ; /* dev of real buffer head */
unsigned long blocknr ; /* block number of real buffer head, == 0 when buffer on disk */
int state ;
long state ;
struct reiserfs_journal_list *jlist ; /* journal list this cnode lives in */
struct reiserfs_journal_cnode *next ; /* next in transaction list */
struct reiserfs_journal_cnode *prev ; /* prev in transaction list */
......@@ -199,7 +199,7 @@ struct reiserfs_journal {
struct block_device *j_dev_bd;
int j_1st_reserved_block; /* first block on s_dev of reserved area journal */
int j_state ;
long j_state ;
unsigned long j_trans_id ;
unsigned long j_mount_id ;
unsigned long j_start ; /* start of current waiting commit (index into j_ap_blocks) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment