5 files changed, 37 insertions, 16 deletions

diff --git a/fs/hpfs/dir.c b/fs/hpfs/dir.c
index ecc9180645ae..594f9c428fc2 100644
--- a/fs/hpfs/dir.c
+++ b/fs/hpfs/dir.c
@@ -84,7 +84,8 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 }
                 if (!fno->dirflag) {
                         e = 1;
-                        hpfs_error(inode->i_sb, "not a directory, fnode %08x",inode->i_ino);
+                        hpfs_error(inode->i_sb, "not a directory, fnode %08lx",
+                                        (unsigned long)inode->i_ino);
                 }
                 if (hpfs_inode->i_dno != fno->u.external[0].disk_secno) {
                         e = 1;
@@ -144,8 +145,11 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 }
                 if (de->first || de->last) {
                         if (hpfs_sb(inode->i_sb)->sb_chk) {
-                                if (de->first && !de->last && (de->namelen != 2 || de ->name[0] != 1 || de->name[1] != 1)) hpfs_error(inode->i_sb, "hpfs_readdir: bad ^A^A entry; pos = %08x", old_pos);
-                                if (de->last && (de->namelen != 1 || de ->name[0] != 255)) hpfs_error(inode->i_sb, "hpfs_readdir: bad \\377 entry; pos = %08x", old_pos);
+                                if (de->first && !de->last && (de->namelen != 2
+                                    || de ->name[0] != 1 || de->name[1] != 1))
+                                        hpfs_error(inode->i_sb, "hpfs_readdir: bad ^A^A entry; pos = %08lx", old_pos);
+                                if (de->last && (de->namelen != 1 || de ->name[0] != 255))
+                                        hpfs_error(inode->i_sb, "hpfs_readdir: bad \\377 entry; pos = %08lx", old_pos);
                         }
                         hpfs_brelse4(&qbh);
                         goto again;
diff --git a/fs/hpfs/dnode.c b/fs/hpfs/dnode.c
index 229ff2fb1809..fe83c2b7d2d8 100644
--- a/fs/hpfs/dnode.c
+++ b/fs/hpfs/dnode.c
@@ -533,10 +533,13 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
                         struct buffer_head *bh;
                         struct dnode *d1;
                         struct quad_buffer_head qbh1;
-                        if (hpfs_sb(i->i_sb)->sb_chk) if (up != i->i_ino) {
-                                hpfs_error(i->i_sb, "bad pointer to fnode, dnode %08x, pointing to %08x, should be %08x", dno, up, i->i_ino);
+                        if (hpfs_sb(i->i_sb)->sb_chk)
+                            if (up != i->i_ino) {
+                                hpfs_error(i->i_sb,
+                                        "bad pointer to fnode, dnode %08x, pointing to %08x, should be %08lx",
+                                        dno, up, (unsigned long)i->i_ino);
                                 return;
-                        }
+                            }
                         if ((d1 = hpfs_map_dnode(i->i_sb, down, &qbh1))) {
                                 d1->up = up;
                                 d1->root_dnode = 1;
@@ -851,7 +854,9 @@ struct hpfs_dirent *map_pos_dirent(struct inode *inode, loff_t *posp,
         /* Going to the next dirent */
         if ((d = de_next_de(de)) < dnode_end_de(dnode)) {
                 if (!(++*posp & 077)) {
-                        hpfs_error(inode->i_sb, "map_pos_dirent: pos crossed dnode boundary; pos = %08x", *posp);
+                        hpfs_error(inode->i_sb,
+                                "map_pos_dirent: pos crossed dnode boundary; pos = %08llx",
+                                (unsigned long long)*posp);
                         goto bail;
                 }
                 /* We're going down the tree */
diff --git a/fs/hpfs/ea.c b/fs/hpfs/ea.c
index 66339dc030e4..547a8384571f 100644
--- a/fs/hpfs/ea.c
+++ b/fs/hpfs/ea.c
@@ -243,8 +243,9 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, char *key, char *data
                 fnode->ea_offs = 0xc4;
         }
         if (fnode->ea_offs < 0xc4 || fnode->ea_offs + fnode->acl_size_s + fnode->ea_size_s > 0x200) {
-                hpfs_error(s, "fnode %08x: ea_offs == %03x, ea_size_s == %03x",
-                        inode->i_ino, fnode->ea_offs, fnode->ea_size_s);
+                hpfs_error(s, "fnode %08lx: ea_offs == %03x, ea_size_s == %03x",
+                        (unsigned long)inode->i_ino,
+                        fnode->ea_offs, fnode->ea_size_s);
                 return;
         }
         if ((fnode->ea_size_s || !fnode->ea_size_l) &&
diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index 7faef8544f32..85d3e1d9ac00 100644
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -251,7 +251,10 @@ void hpfs_write_inode_nolock(struct inode *i)
                         de->file_size = 0;
                         hpfs_mark_4buffers_dirty(&qbh);
                         hpfs_brelse4(&qbh);
-                } else hpfs_error(i->i_sb, "directory %08x doesn't have '.' entry", i->i_ino);
+                } else
+                        hpfs_error(i->i_sb,
+                                "directory %08lx doesn't have '.' entry",
+                                (unsigned long)i->i_ino);
         }
         mark_buffer_dirty(bh);
         brelse(bh);
diff --git a/fs/hpfs/map.c b/fs/hpfs/map.c
index 0fecdac22e4e..c4724589b2eb 100644
--- a/fs/hpfs/map.c
+++ b/fs/hpfs/map.c
@@ -126,32 +126,40 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea
                         struct extended_attribute *ea;
                         struct extended_attribute *ea_end;
                         if (fnode->magic != FNODE_MAGIC) {
-                                hpfs_error(s, "bad magic on fnode %08x", ino);
+                                hpfs_error(s, "bad magic on fnode %08lx",
+                                        (unsigned long)ino);
                                 goto bail;
                         }
                         if (!fnode->dirflag) {
                                 if ((unsigned)fnode->btree.n_used_nodes + (unsigned)fnode->btree.n_free_nodes !=
                                     (fnode->btree.internal ? 12 : 8)) {
-                                        hpfs_error(s, "bad number of nodes in fnode %08x", ino);
+                                        hpfs_error(s,
+                                           "bad number of nodes in fnode %08lx",
+                                            (unsigned long)ino);
                                         goto bail;
                                 }
                                 if (fnode->btree.first_free !=
                                     8 + fnode->btree.n_used_nodes * (fnode->btree.internal ? 8 : 12)) {
-                                        hpfs_error(s, "bad first_free pointer in fnode %08x", ino);
+                                        hpfs_error(s,
+                                            "bad first_free pointer in fnode %08lx",
+                                            (unsigned long)ino);
                                         goto bail;
                                 }
                         }
                         if (fnode->ea_size_s && ((signed int)fnode->ea_offs < 0xc4 ||
                            (signed int)fnode->ea_offs + fnode->acl_size_s + fnode->ea_size_s > 0x200)) {
-                                hpfs_error(s, "bad EA info in fnode %08x: ea_offs == %04x ea_size_s == %04x",
-                                        ino, fnode->ea_offs, fnode->ea_size_s);
+                                hpfs_error(s,
+                                        "bad EA info in fnode %08lx: ea_offs == %04x ea_size_s == %04x",
+                                        (unsigned long)ino,
+                                        fnode->ea_offs, fnode->ea_size_s);
                                 goto bail;
                         }
                         ea = fnode_ea(fnode);
                         ea_end = fnode_end_ea(fnode);
                         while (ea != ea_end) {
                                 if (ea > ea_end) {
-                                        hpfs_error(s, "bad EA in fnode %08x", ino);
+                                        hpfs_error(s, "bad EA in fnode %08lx",
+                                                (unsigned long)ino);
                                         goto bail;
                                 }
                                 ea = next_ea(ea);