[PATCH] reiserfs bitops warnings

This fixes reiserfs compile warnings for a few bitops calls.

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 6fccbbe01fc04f1e81d97757ee8c833a25cdde03..9de865554b51865b1c5859c14af2856fdbf1fc5d 100644 (file)
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -204,7 +204,7 @@ static int set_bit_in_list_bitmap(struct super_block *p_s_sb, int block,
   if (!jb->bitmaps[bmap_nr]) {
     jb->bitmaps[bmap_nr] = get_bitmap_node(p_s_sb) ;
   }
-  set_bit(bit_nr, jb->bitmaps[bmap_nr]->data) ;
+  set_bit(bit_nr, (unsigned long *)jb->bitmaps[bmap_nr]->data) ;
   return 0 ;
 }
 
@@ -550,7 +550,7 @@ int reiserfs_in_journal(struct super_block *p_s_sb,
       PROC_INFO_INC( p_s_sb, journal.in_journal_bitmap );
       jb = SB_JOURNAL(p_s_sb)->j_list_bitmap + i ;
       if (jb->journal_list && jb->bitmaps[bmap_nr] &&
-          test_bit(bit_nr, jb->bitmaps[bmap_nr]->data)) {
+          test_bit(bit_nr, (unsigned long *)jb->bitmaps[bmap_nr]->data)) {
        tmp_bit = find_next_zero_bit((unsigned long *)
                                     (jb->bitmaps[bmap_nr]->data),
                                     p_s_sb->s_blocksize << 3, bit_nr+1) ; 

diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index a29293f0c9ab8d39da5b0954497d74cf8483ee85..ba2e70bc22a2e0d61a0e637b26263152c48fb8a3 100644 (file)
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -248,7 +248,7 @@ static int linear_search_in_dir_item (struct cpu_key * key, struct reiserfs_dir_
    
        /* mark, that this generation number is used */
        if (de->de_gen_number_bit_string)
-           set_bit (GET_GENERATION_NUMBER (deh_offset (deh)), de->de_gen_number_bit_string);
+           set_bit (GET_GENERATION_NUMBER (deh_offset (deh)), (unsigned long *)de->de_gen_number_bit_string);
 
        // calculate pointer to name and namelen
        de->de_entry_num = i;
@@ -504,7 +504,7 @@ static int reiserfs_add_entry (struct reiserfs_transaction_handle *th, struct in
        return -EEXIST;
     }
 
-    gen_number = find_first_zero_bit (bit_string, MAX_GENERATION_NUMBER + 1);
+    gen_number = find_first_zero_bit ((unsigned long *)bit_string, MAX_GENERATION_NUMBER + 1);
     if (gen_number > MAX_GENERATION_NUMBER) {
       /* there is no free generation number */
       reiserfs_warning ("reiserfs_add_entry: Congratulations! we have got hash function screwed up\n");