1 files changed, 10 insertions, 10 deletions

diff --git a/fs/hpfs/map.c b/fs/hpfs/map.c
index a790821366a7..4acb19d78359 100644
--- a/fs/hpfs/map.c
+++ b/fs/hpfs/map.c
@@ -8,12 +8,12 @@
 
 #include "hpfs_fn.h"
 
-unsigned *hpfs_map_dnode_bitmap(struct super_block *s, struct quad_buffer_head *qbh)
+__le32 *hpfs_map_dnode_bitmap(struct super_block *s, struct quad_buffer_head *qbh)
 {
         return hpfs_map_4sectors(s, hpfs_sb(s)->sb_dmap, qbh, 0);
 }
 
-unsigned int *hpfs_map_bitmap(struct super_block *s, unsigned bmp_block,
+__le32 *hpfs_map_bitmap(struct super_block *s, unsigned bmp_block,
                          struct quad_buffer_head *qbh, char *id)
 {
         secno sec;
@@ -89,18 +89,18 @@ unsigned char *hpfs_load_code_page(struct super_block *s, secno cps)
         return cp_table;
 }
 
-secno *hpfs_load_bitmap_directory(struct super_block *s, secno bmp)
+__le32 *hpfs_load_bitmap_directory(struct super_block *s, secno bmp)
 {
         struct buffer_head *bh;
         int n = (hpfs_sb(s)->sb_fs_size + 0x200000 - 1) >> 21;
         int i;
-        secno *b;
+        __le32 *b;
         if (!(b = kmalloc(n * 512, GFP_KERNEL))) {
                 printk("HPFS: can't allocate memory for bitmap directory\n");
                 return NULL;
         }       
         for (i=0;i<n;i++) {
-                secno *d = hpfs_map_sector(s, bmp+i, &bh, n - i - 1);
+                __le32 *d = hpfs_map_sector(s, bmp+i, &bh, n - i - 1);
                 if (!d) {
                         kfree(b);
                         return NULL;
@@ -130,16 +130,16 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea
                                         (unsigned long)ino);
                                 goto bail;
                         }
-                        if (!fnode->dirflag) {
+                        if (!fnode_is_dir(fnode)) {
                                 if ((unsigned)fnode->btree.n_used_nodes + (unsigned)fnode->btree.n_free_nodes !=
-                                    (fnode->btree.internal ? 12 : 8)) {
+                                    (bp_internal(&fnode->btree) ? 12 : 8)) {
                                         hpfs_error(s,
                                            "bad number of nodes in fnode %08lx",
                                             (unsigned long)ino);
                                         goto bail;
                                 }
                                 if (le16_to_cpu(fnode->btree.first_free) !=
-                                    8 + fnode->btree.n_used_nodes * (fnode->btree.internal ? 8 : 12)) {
+                                    8 + fnode->btree.n_used_nodes * (bp_internal(&fnode->btree) ? 8 : 12)) {
                                         hpfs_error(s,
                                             "bad first_free pointer in fnode %08lx",
                                             (unsigned long)ino);
@@ -187,12 +187,12 @@ struct anode *hpfs_map_anode(struct super_block *s, anode_secno ano, struct buff
                                 goto bail;
                         }
                         if ((unsigned)anode->btree.n_used_nodes + (unsigned)anode->btree.n_free_nodes !=
-                            (anode->btree.internal ? 60 : 40)) {
+                            (bp_internal(&anode->btree) ? 60 : 40)) {
                                 hpfs_error(s, "bad number of nodes in anode %08x", ano);
                                 goto bail;
                         }
                         if (le16_to_cpu(anode->btree.first_free) !=
-                            8 + anode->btree.n_used_nodes * (anode->btree.internal ? 8 : 12)) {
+                            8 + anode->btree.n_used_nodes * (bp_internal(&anode->btree) ? 8 : 12)) {
                                 hpfs_error(s, "bad first_free pointer in anode %08x", ano);
                                 goto bail;
                         }