redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

fs/affs: fix casting in printed messages

Browse source 
- "inode.i_ino" is "unsigned long",
  - "loff_t" is always "unsigned long long",
  - "sector_t" should be cast to "unsigned long long" for printing,
  - "u32" should not be cast to "unsigned int" for printing.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Geert Uytterhoeven 2015-02-17 13:46:10 -08:00 committed by Linus Torvalds
parent e22553e2a2
commit 08fe100d91
5 changed files with 33 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/affs/amigaffs.c
View file

@ -30,7 +30,7 @@ affs_insert_hash(struct inode *dir, struct buffer_head *bh)
ino = bh->b_blocknr; ino = bh->b_blocknr;
offset = affs_hash_name(sb, AFFS_TAIL(sb, bh)->name + 1, AFFS_TAIL(sb, bh)->name[0]); offset = affs_hash_name(sb, AFFS_TAIL(sb, bh)->name + 1, AFFS_TAIL(sb, bh)->name[0]);
pr_debug("%s(dir=%u, ino=%d)\n", __func__, (u32)dir->i_ino, ino); pr_debug("%s(dir=%lu, ino=%d)\n", __func__, dir->i_ino, ino);
dir_bh = affs_bread(sb, dir->i_ino); dir_bh = affs_bread(sb, dir->i_ino);
if (!dir_bh) if (!dir_bh)
@ -80,8 +80,8 @@ affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh)
sb = dir->i_sb; sb = dir->i_sb;
rem_ino = rem_bh->b_blocknr; rem_ino = rem_bh->b_blocknr;
offset = affs_hash_name(sb, AFFS_TAIL(sb, rem_bh)->name+1, AFFS_TAIL(sb, rem_bh)->name[0]); offset = affs_hash_name(sb, AFFS_TAIL(sb, rem_bh)->name+1, AFFS_TAIL(sb, rem_bh)->name[0]);
pr_debug("%s(dir=%d, ino=%d, hashval=%d)\n", pr_debug("%s(dir=%lu, ino=%d, hashval=%d)\n", __func__, dir->i_ino,
__func__, (u32)dir->i_ino, rem_ino, offset); rem_ino, offset);
bh = affs_bread(sb, dir->i_ino); bh = affs_bread(sb, dir->i_ino);
if (!bh) if (!bh)

8
fs/affs/dir.c
View file

@ -54,8 +54,7 @@ affs_readdir(struct file *file, struct dir_context *ctx)
u32 ino; u32 ino;
int error = 0; int error = 0;
pr_debug("%s(ino=%lu,f_pos=%lx)\n", pr_debug("%s(ino=%lu,f_pos=%llx)\n", __func__, inode->i_ino, ctx->pos);
__func__, inode->i_ino, (unsigned long)ctx->pos);
if (ctx->pos < 2) { if (ctx->pos < 2) {
file->private_data = (void *)0; file->private_data = (void *)0;
@ -117,9 +116,8 @@ inside:
namelen = min(AFFS_TAIL(sb, fh_bh)->name[0], (u8)30); namelen = min(AFFS_TAIL(sb, fh_bh)->name[0], (u8)30);
name = AFFS_TAIL(sb, fh_bh)->name + 1; name = AFFS_TAIL(sb, fh_bh)->name + 1;
pr_debug("readdir(): dir_emit(\"%.*s\", " pr_debug("readdir(): dir_emit(\"%.*s\", ino=%u), hash=%d, f_pos=%llx\n",
"ino=%u), hash=%d, f_pos=%x\n", namelen, name, ino, hash_pos, ctx->pos);
namelen, name, ino, hash_pos, (u32)ctx->pos);
if (!dir_emit(ctx, name, namelen, ino, DT_UNKNOWN)) if (!dir_emit(ctx, name, namelen, ino, DT_UNKNOWN))
goto done; goto done;

36
fs/affs/file.c
View file

@ -299,8 +299,8 @@ affs_get_block(struct inode *inode, sector_t block, struct buffer_head *bh_resul
struct buffer_head *ext_bh; struct buffer_head *ext_bh;
u32 ext; u32 ext;
pr_debug("%s(%u, %lu)\n", pr_debug("%s(%lu, %llu)\n", __func__, inode->i_ino,
__func__, (u32)inode->i_ino, (unsigned long)block); (unsigned long long)block);
BUG_ON(block > (sector_t)0x7fffffffUL); BUG_ON(block > (sector_t)0x7fffffffUL);
@ -330,8 +330,9 @@ affs_get_block(struct inode *inode, sector_t block, struct buffer_head *bh_resul
/* store new block */ /* store new block */
if (bh_result->b_blocknr) if (bh_result->b_blocknr)
affs_warning(sb, "get_block", "block already set (%lx)", affs_warning(sb, "get_block",
(unsigned long)bh_result->b_blocknr); "block already set (%llx)",
(unsigned long long)bh_result->b_blocknr);
AFFS_BLOCK(sb, ext_bh, block) = cpu_to_be32(blocknr); AFFS_BLOCK(sb, ext_bh, block) = cpu_to_be32(blocknr);
AFFS_HEAD(ext_bh)->block_count = cpu_to_be32(block + 1); AFFS_HEAD(ext_bh)->block_count = cpu_to_be32(block + 1);
affs_adjust_checksum(ext_bh, blocknr - bh_result->b_blocknr + 1); affs_adjust_checksum(ext_bh, blocknr - bh_result->b_blocknr + 1);
@ -353,8 +354,8 @@ affs_get_block(struct inode *inode, sector_t block, struct buffer_head *bh_resul
return 0; return 0;
err_big: err_big:
affs_error(inode->i_sb, "get_block", "strange block request %d", affs_error(inode->i_sb, "get_block", "strange block request %llu",
(int)block); (unsigned long long)block);
return -EIO; return -EIO;
err_ext: err_ext:
// unlock cache // unlock cache
@ -503,7 +504,7 @@ affs_do_readpage_ofs(struct page *page, unsigned to)
u32 bidx, boff, bsize; u32 bidx, boff, bsize;
u32 tmp; u32 tmp;
pr_debug("%s(%u, %ld, 0, %d)\n", __func__, (u32)inode->i_ino, pr_debug("%s(%lu, %ld, 0, %d)\n", __func__, inode->i_ino,
page->index, to); page->index, to);
BUG_ON(to > PAGE_CACHE_SIZE); BUG_ON(to > PAGE_CACHE_SIZE);
kmap(page); kmap(page);
@ -539,7 +540,7 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize)
u32 size, bsize; u32 size, bsize;
u32 tmp; u32 tmp;
pr_debug("%s(%u, %d)\n", __func__, (u32)inode->i_ino, newsize); pr_debug("%s(%lu, %d)\n", __func__, inode->i_ino, newsize);
bsize = AFFS_SB(sb)->s_data_blksize; bsize = AFFS_SB(sb)->s_data_blksize;
bh = NULL; bh = NULL;
size = AFFS_I(inode)->mmu_private; size = AFFS_I(inode)->mmu_private;
@ -608,7 +609,7 @@ affs_readpage_ofs(struct file *file, struct page *page)
u32 to; u32 to;
int err; int err;
pr_debug("%s(%u, %ld)\n", __func__, (u32)inode->i_ino, page->index); pr_debug("%s(%lu, %ld)\n", __func__, inode->i_ino, page->index);
to = PAGE_CACHE_SIZE; to = PAGE_CACHE_SIZE;
if (((page->index + 1) << PAGE_CACHE_SHIFT) > inode->i_size) { if (((page->index + 1) << PAGE_CACHE_SHIFT) > inode->i_size) {
to = inode->i_size & ~PAGE_CACHE_MASK; to = inode->i_size & ~PAGE_CACHE_MASK;
@ -631,8 +632,8 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping
pgoff_t index; pgoff_t index;
int err = 0; int err = 0;
pr_debug("%s(%u, %llu, %llu)\n", __func__, (u32)inode->i_ino, pr_debug("%s(%lu, %llu, %llu)\n", __func__, inode->i_ino, pos,
(unsigned long long)pos, (unsigned long long)pos + len); pos + len);
if (pos > AFFS_I(inode)->mmu_private) { if (pos > AFFS_I(inode)->mmu_private) {
/* XXX: this probably leaves a too-big i_size in case of /* XXX: this probably leaves a too-big i_size in case of
* failure. Should really be updating i_size at write_end time * failure. Should really be updating i_size at write_end time
@ -681,9 +682,8 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,
* due to write_begin. * due to write_begin.
*/ */
pr_debug("%s(%u, %llu, %llu)\n", pr_debug("%s(%lu, %llu, %llu)\n", __func__, inode->i_ino, pos,
__func__, (u32)inode->i_ino, (unsigned long long)pos, pos + len);
(unsigned long long)pos + len);
bsize = AFFS_SB(sb)->s_data_blksize; bsize = AFFS_SB(sb)->s_data_blksize;
data = page_address(page); data = page_address(page);
@ -831,8 +831,8 @@ affs_truncate(struct inode *inode)
struct buffer_head *ext_bh; struct buffer_head *ext_bh;
int i; int i;
pr_debug("truncate(inode=%d, oldsize=%u, newsize=%u)\n", pr_debug("truncate(inode=%lu, oldsize=%llu, newsize=%llu)\n",
(u32)inode->i_ino, (u32)AFFS_I(inode)->mmu_private, (u32)inode->i_size); inode->i_ino, AFFS_I(inode)->mmu_private, inode->i_size);
last_blk = 0; last_blk = 0;
ext = 0; ext = 0;
@ -863,7 +863,7 @@ affs_truncate(struct inode *inode)
if (IS_ERR(ext_bh)) { if (IS_ERR(ext_bh)) {
affs_warning(sb, "truncate", affs_warning(sb, "truncate",
"unexpected read error for ext block %u (%ld)", "unexpected read error for ext block %u (%ld)",
(unsigned int)ext, PTR_ERR(ext_bh)); ext, PTR_ERR(ext_bh));
return; return;
} }
if (AFFS_I(inode)->i_lc) { if (AFFS_I(inode)->i_lc) {
@ -911,7 +911,7 @@ affs_truncate(struct inode *inode)
if (IS_ERR(bh)) { if (IS_ERR(bh)) {
affs_warning(sb, "truncate", affs_warning(sb, "truncate",
"unexpected read error for last block %u (%ld)", "unexpected read error for last block %u (%ld)",
(unsigned int)ext, PTR_ERR(bh)); ext, PTR_ERR(bh));
return; return;
} }
tmp = be32_to_cpu(AFFS_DATA_HEAD(bh)->next); tmp = be32_to_cpu(AFFS_DATA_HEAD(bh)->next);

5
fs/affs/inode.c
View file

@ -348,9 +348,8 @@ affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s3
u32 block = 0; u32 block = 0;
int retval; int retval;
pr_debug("%s(dir=%u, inode=%u, \"%pd\", type=%d)\n", pr_debug("%s(dir=%lu, inode=%lu, \"%pd\", type=%d)\n", __func__,
__func__, (u32)dir->i_ino, dir->i_ino, inode->i_ino, dentry, type);
(u32)inode->i_ino, dentry, type);
retval = -EIO; retval = -EIO;
bh = affs_bread(sb, inode->i_ino); bh = affs_bread(sb, inode->i_ino);

18
fs/affs/namei.c
View file

@ -248,9 +248,8 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
int int
affs_unlink(struct inode *dir, struct dentry *dentry) affs_unlink(struct inode *dir, struct dentry *dentry)
{ {
pr_debug("%s(dir=%d, %lu \"%pd\")\n", pr_debug("%s(dir=%lu, %lu \"%pd\")\n", __func__, dir->i_ino,
__func__, (u32)dir->i_ino, dentry->d_inode->i_ino, dentry->d_inode->i_ino, dentry);
dentry);
return affs_remove_header(dentry); return affs_remove_header(dentry);
} }
@ -317,9 +316,8 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
int int
affs_rmdir(struct inode *dir, struct dentry *dentry) affs_rmdir(struct inode *dir, struct dentry *dentry)
{ {
pr_debug("%s(dir=%u, %lu \"%pd\")\n", pr_debug("%s(dir=%lu, %lu \"%pd\")\n", __func__, dir->i_ino,
__func__, (u32)dir->i_ino, dentry->d_inode->i_ino, dentry->d_inode->i_ino, dentry);
dentry);
return affs_remove_header(dentry); return affs_remove_header(dentry);
} }
@ -404,8 +402,7 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
{ {
struct inode *inode = old_dentry->d_inode; struct inode *inode = old_dentry->d_inode;
pr_debug("%s(%u, %u, \"%pd\")\n", pr_debug("%s(%lu, %lu, \"%pd\")\n", __func__, inode->i_ino, dir->i_ino,
__func__, (u32)inode->i_ino, (u32)dir->i_ino,
dentry); dentry);
return affs_add_entry(dir, inode, dentry, ST_LINKFILE); return affs_add_entry(dir, inode, dentry, ST_LINKFILE);
@ -419,9 +416,8 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
int retval; int retval;
pr_debug("%s(old=%u,\"%pd\" to new=%u,\"%pd\")\n", pr_debug("%s(old=%lu,\"%pd\" to new=%lu,\"%pd\")\n", __func__,
__func__, (u32)old_dir->i_ino, old_dentry, old_dir->i_ino, old_dentry, new_dir->i_ino, new_dentry);
(u32)new_dir->i_ino, new_dentry);
retval = affs_check_name(new_dentry->d_name.name, retval = affs_check_name(new_dentry->d_name.name,
new_dentry->d_name.len, new_dentry->d_name.len,