adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] hpfs: fix printk format warnings

Browse source 
Fix hpfs printk warnings:

  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 <randy.dunlap@oracle.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Randy Dunlap 2006-12-06 20:37:05 -08:00 committed by Linus Torvalds
parent 352d94d040
commit 18debbbcce
5 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/hpfs/dir.c
View file

@ -84,7 +84,8 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
} }
if (!fno->dirflag) { if (!fno->dirflag) {
e = 1; 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) { if (hpfs_inode->i_dno != fno->u.external[0].disk_secno) {
e = 1; e = 1;
@ -144,8 +145,11 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
} }
if (de->first || de->last) { if (de->first || de->last) {
if (hpfs_sb(inode->i_sb)->sb_chk) { 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->first && !de->last && (de->namelen != 2
if (de->last && (de->namelen != 1 || de ->name[0] != 255)) hpfs_error(inode->i_sb, "hpfs_readdir: bad \\377 entry; pos = %08x", old_pos); || 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); hpfs_brelse4(&qbh);
goto again; goto again;

13
fs/hpfs/dnode.c
View file

@ -533,10 +533,13 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
struct buffer_head *bh; struct buffer_head *bh;
struct dnode *d1; struct dnode *d1;
struct quad_buffer_head qbh1; struct quad_buffer_head qbh1;
if (hpfs_sb(i->i_sb)->sb_chk) if (up != i->i_ino) { if (hpfs_sb(i->i_sb)->sb_chk)
hpfs_error(i->i_sb, "bad pointer to fnode, dnode %08x, pointing to %08x, should be %08x", dno, up, i->i_ino); 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; return;
} }
if ((d1 = hpfs_map_dnode(i->i_sb, down, &qbh1))) { if ((d1 = hpfs_map_dnode(i->i_sb, down, &qbh1))) {
d1->up = up; d1->up = up;
d1->root_dnode = 1; 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 */ /* Going to the next dirent */
if ((d = de_next_de(de)) < dnode_end_de(dnode)) { if ((d = de_next_de(de)) < dnode_end_de(dnode)) {
if (!(++*posp & 077)) { 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; goto bail;
} }
/* We're going down the tree */ /* We're going down the tree */

5
fs/hpfs/ea.c
View file

@ -243,8 +243,9 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, char *key, char *data
fnode->ea_offs = 0xc4; fnode->ea_offs = 0xc4;
} }
if (fnode->ea_offs < 0xc4 || fnode->ea_offs + fnode->acl_size_s + fnode->ea_size_s > 0x200) { 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", hpfs_error(s, "fnode %08lx: ea_offs == %03x, ea_size_s == %03x",
inode->i_ino, fnode->ea_offs, fnode->ea_size_s); (unsigned long)inode->i_ino,
fnode->ea_offs, fnode->ea_size_s);
return; return;
} }
if ((fnode->ea_size_s || !fnode->ea_size_l) && if ((fnode->ea_size_s || !fnode->ea_size_l) &&

5
fs/hpfs/inode.c
View file

@ -251,7 +251,10 @@ void hpfs_write_inode_nolock(struct inode *i)
de->file_size = 0; de->file_size = 0;
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&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); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);

20
fs/hpfs/map.c
View file

@ -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;
struct extended_attribute *ea_end; struct extended_attribute *ea_end;
if (fnode->magic != FNODE_MAGIC) { 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; goto bail;
} }
if (!fnode->dirflag) { if (!fnode->dirflag) {
if ((unsigned)fnode->btree.n_used_nodes + (unsigned)fnode->btree.n_free_nodes != if ((unsigned)fnode->btree.n_used_nodes + (unsigned)fnode->btree.n_free_nodes !=
(fnode->btree.internal ? 12 : 8)) { (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; goto bail;
} }
if (fnode->btree.first_free != if (fnode->btree.first_free !=
8 + fnode->btree.n_used_nodes * (fnode->btree.internal ? 8 : 12)) { 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; goto bail;
} }
} }
if (fnode->ea_size_s && ((signed int)fnode->ea_offs < 0xc4 || 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)) { (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", hpfs_error(s,
ino, fnode->ea_offs, fnode->ea_size_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; goto bail;
} }
ea = fnode_ea(fnode); ea = fnode_ea(fnode);
ea_end = fnode_end_ea(fnode); ea_end = fnode_end_ea(fnode);
while (ea != ea_end) { while (ea != ea_end) {
if (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; goto bail;
} }
ea = next_ea(ea); ea = next_ea(ea);