Commit 2a022093 authored by Richard Henderson's avatar Richard Henderson

Fix warnings of the form

  warning: long int format, different type arg (arg 5)
by casting ino_t arguments to unsigned long for printf formats.
In some instances, change %ld to %lu.
parent bec0e17e
...@@ -342,7 +342,8 @@ struct inode * ext2_new_inode(struct inode * dir, int mode) ...@@ -342,7 +342,8 @@ struct inode * ext2_new_inode(struct inode * dir, int mode)
if (ino < EXT2_FIRST_INO(sb) || ino > le32_to_cpu(es->s_inodes_count)) { if (ino < EXT2_FIRST_INO(sb) || ino > le32_to_cpu(es->s_inodes_count)) {
ext2_error (sb, "ext2_new_inode", ext2_error (sb, "ext2_new_inode",
"reserved inode or inode > inodes count - " "reserved inode or inode > inodes count - "
"block_group = %d,inode=%ld", group, ino); "block_group = %d,inode=%lu", group,
(unsigned long) ino);
err = -EIO; err = -EIO;
goto fail2; goto fail2;
} }
......
...@@ -952,12 +952,13 @@ static struct ext2_inode *ext2_get_inode(struct super_block *sb, ino_t ino, ...@@ -952,12 +952,13 @@ static struct ext2_inode *ext2_get_inode(struct super_block *sb, ino_t ino,
return (struct ext2_inode *) (bh->b_data + offset); return (struct ext2_inode *) (bh->b_data + offset);
Einval: Einval:
ext2_error(sb, "ext2_get_inode", "bad inode number: %lu", ino); ext2_error(sb, "ext2_get_inode", "bad inode number: %lu",
(unsigned long) ino);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
Eio: Eio:
ext2_error(sb, "ext2_get_inode", ext2_error(sb, "ext2_get_inode",
"unable to read inode block - inode=%lu, block=%lu", "unable to read inode block - inode=%lu, block=%lu",
ino, block); (unsigned long) ino, block);
Egdp: Egdp:
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
} }
...@@ -1076,7 +1077,8 @@ static int ext2_update_inode(struct inode * inode, int do_sync) ...@@ -1076,7 +1077,8 @@ static int ext2_update_inode(struct inode * inode, int do_sync)
return -EIO; return -EIO;
if (ino == EXT2_ACL_IDX_INO || ino == EXT2_ACL_DATA_INO) { if (ino == EXT2_ACL_IDX_INO || ino == EXT2_ACL_DATA_INO) {
ext2_error (sb, "ext2_write_inode", "bad inode number: %lu", ino); ext2_error (sb, "ext2_write_inode", "bad inode number: %lu",
(unsigned long) ino);
brelse(bh); brelse(bh);
return -EIO; return -EIO;
} }
...@@ -1146,7 +1148,7 @@ static int ext2_update_inode(struct inode * inode, int do_sync) ...@@ -1146,7 +1148,7 @@ static int ext2_update_inode(struct inode * inode, int do_sync)
wait_on_buffer (bh); wait_on_buffer (bh);
if (buffer_req(bh) && !buffer_uptodate(bh)) { if (buffer_req(bh) && !buffer_uptodate(bh)) {
printk ("IO error syncing ext2 inode [%s:%08lx]\n", printk ("IO error syncing ext2 inode [%s:%08lx]\n",
sb->s_id, ino); sb->s_id, (unsigned long) ino);
err = -EIO; err = -EIO;
} }
} }
......
...@@ -458,7 +458,8 @@ struct inode *ext3_orphan_get (struct super_block * sb, ino_t ino) ...@@ -458,7 +458,8 @@ struct inode *ext3_orphan_get (struct super_block * sb, ino_t ino)
/* Error cases - e2fsck has already cleaned up for us */ /* Error cases - e2fsck has already cleaned up for us */
if (ino > max_ino) { if (ino > max_ino) {
ext3_warning(sb, __FUNCTION__, ext3_warning(sb, __FUNCTION__,
"bad orphan ino %ld! e2fsck was run?\n", ino); "bad orphan ino %lu! e2fsck was run?\n",
(unsigned long) ino);
goto out; goto out;
} }
...@@ -467,7 +468,8 @@ struct inode *ext3_orphan_get (struct super_block * sb, ino_t ino) ...@@ -467,7 +468,8 @@ struct inode *ext3_orphan_get (struct super_block * sb, ino_t ino)
bitmap_bh = read_inode_bitmap(sb, block_group); bitmap_bh = read_inode_bitmap(sb, block_group);
if (!bitmap_bh) { if (!bitmap_bh) {
ext3_warning(sb, __FUNCTION__, ext3_warning(sb, __FUNCTION__,
"inode bitmap error for orphan %ld\n", ino); "inode bitmap error for orphan %lu\n",
(unsigned long) ino);
goto out; goto out;
} }
...@@ -490,7 +492,8 @@ struct inode *ext3_orphan_get (struct super_block * sb, ino_t ino) ...@@ -490,7 +492,8 @@ struct inode *ext3_orphan_get (struct super_block * sb, ino_t ino)
is_bad_inode(inode)); is_bad_inode(inode));
printk(KERN_NOTICE "NEXT_ORPHAN(inode)=%d\n", printk(KERN_NOTICE "NEXT_ORPHAN(inode)=%d\n",
NEXT_ORPHAN(inode)); NEXT_ORPHAN(inode));
printk(KERN_NOTICE "max_ino=%ld\n", max_ino); printk(KERN_NOTICE "max_ino=%lu\n",
(unsigned long) max_ino);
} }
/* Avoid freeing blocks if we got a bad deleted inode */ /* Avoid freeing blocks if we got a bad deleted inode */
if (inode && inode->i_nlink == 0) if (inode && inode->i_nlink == 0)
......
...@@ -781,7 +781,8 @@ exp_unexport(struct nfsctl_export *nxp) ...@@ -781,7 +781,8 @@ exp_unexport(struct nfsctl_export *nxp)
expkey_put(&key->h, &svc_expkey_cache); expkey_put(&key->h, &svc_expkey_cache);
} else } else
dprintk("nfsd: no export %x/%lx for %s\n", dprintk("nfsd: no export %x/%lx for %s\n",
nxp->ex_dev, nxp->ex_ino, nxp->ex_client); nxp->ex_dev, (unsigned long) nxp->ex_ino,
nxp->ex_client);
auth_domain_put(dom); auth_domain_put(dom);
cache_flush(); cache_flush();
} else } else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment