Re: [PATCH -mm] hpfs: fix printk format warnings
From: Randy Dunlap [EMAIL PROTECTED]
Fix hpfs printk warnings:
(why do I only see these in -mm?)
Probably because -mm has unsigned long inode number and Linus' kernel has
just unsigned int?
Change it this way:
hpfs_error(inode-i_sb, not a directory, fnode %08lx,
(unsigned long)inode-i_ino);
--- so that it can work on both.
Mikulas
fs/hpfs/dir.c:87: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long unsigned int'
fs/hpfs/dir.c:147: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long int'
fs/hpfs/dir.c:148: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long int'
fs/hpfs/dnode.c:537: warning: format '%08x' expects type 'unsigned int', but
argument 5 has type 'long unsigned int'
fs/hpfs/dnode.c:854: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'loff_t'
fs/hpfs/ea.c:247: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long unsigned int'
fs/hpfs/inode.c:254: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long unsigned int'
fs/hpfs/map.c:129: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
fs/hpfs/map.c:135: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
fs/hpfs/map.c:140: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
fs/hpfs/map.c:147: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
fs/hpfs/map.c:154: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
Signed-off-by: Randy Dunlap [EMAIL PROTECTED]
---
fs/hpfs/dir.c | 10 +++---
fs/hpfs/dnode.c | 13 +
fs/hpfs/ea.c|2 +-
fs/hpfs/inode.c |5 -
fs/hpfs/map.c | 20 ++--
5 files changed, 35 insertions(+), 15 deletions(-)
--- linux-2619-rc5mm2.orig/fs/hpfs/dir.c
+++ linux-2619-rc5mm2/fs/hpfs/dir.c
@@ -84,7 +84,8 @@ static int hpfs_readdir(struct file *fil
}
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,
+ 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 *fil
}
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;
--- linux-2619-rc5mm2.orig/fs/hpfs/dnode.c
+++ linux-2619-rc5mm2/fs/hpfs/dnode.c
@@ -533,10 +533,13 @@ static void delete_empty_dnode(struct in
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, 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(struc
/* 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);
+
[PATCH -mm] hpfs: fix printk format warnings
From: Randy Dunlap [EMAIL PROTECTED]
Fix hpfs printk warnings:
(why do I only see these in -mm?)
fs/hpfs/dir.c:87: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long unsigned int'
fs/hpfs/dir.c:147: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long int'
fs/hpfs/dir.c:148: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long int'
fs/hpfs/dnode.c:537: warning: format '%08x' expects type 'unsigned int', but
argument 5 has type 'long unsigned int'
fs/hpfs/dnode.c:854: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'loff_t'
fs/hpfs/ea.c:247: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long unsigned int'
fs/hpfs/inode.c:254: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'long unsigned int'
fs/hpfs/map.c:129: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
fs/hpfs/map.c:135: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
fs/hpfs/map.c:140: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
fs/hpfs/map.c:147: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
fs/hpfs/map.c:154: warning: format '%08x' expects type 'unsigned int', but
argument 3 has type 'ino_t'
Signed-off-by: Randy Dunlap [EMAIL PROTECTED]
---
fs/hpfs/dir.c | 10 +++---
fs/hpfs/dnode.c | 13 +
fs/hpfs/ea.c|2 +-
fs/hpfs/inode.c |5 -
fs/hpfs/map.c | 20 ++--
5 files changed, 35 insertions(+), 15 deletions(-)
--- linux-2619-rc5mm2.orig/fs/hpfs/dir.c
+++ linux-2619-rc5mm2/fs/hpfs/dir.c
@@ -84,7 +84,8 @@ static int hpfs_readdir(struct file *fil
}
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,
+ 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 *fil
}
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;
--- linux-2619-rc5mm2.orig/fs/hpfs/dnode.c
+++ linux-2619-rc5mm2/fs/hpfs/dnode.c
@@ -533,10 +533,13 @@ static void delete_empty_dnode(struct in
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, 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(struc
/* 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;
