aboutsummaryrefslogtreecommitdiffstats
path: root/fs/affs/namei.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2015-02-17 16:46:10 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-17 17:34:52 -0500
commit08fe100d91bc09baca9eb22206f6b050286bd43c (patch)
treee7e631a14f9c20e5f4c3c299a1b09f2134f944bd /fs/affs/namei.c
parente22553e2a25ed3f2a9c874088e0f20cdcd97c7b0 (diff)
fs/affs: fix casting in printed messages
- "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>
Diffstat (limited to 'fs/affs/namei.c')
-rw-r--r--fs/affs/namei.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index bbc38530e924..de84f4d3e9ec 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -248,9 +248,8 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
248int 248int
249affs_unlink(struct inode *dir, struct dentry *dentry) 249affs_unlink(struct inode *dir, struct dentry *dentry)
250{ 250{
251 pr_debug("%s(dir=%d, %lu \"%pd\")\n", 251 pr_debug("%s(dir=%lu, %lu \"%pd\")\n", __func__, dir->i_ino,
252 __func__, (u32)dir->i_ino, dentry->d_inode->i_ino, 252 dentry->d_inode->i_ino, dentry);
253 dentry);
254 253
255 return affs_remove_header(dentry); 254 return affs_remove_header(dentry);
256} 255}
@@ -317,9 +316,8 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
317int 316int
318affs_rmdir(struct inode *dir, struct dentry *dentry) 317affs_rmdir(struct inode *dir, struct dentry *dentry)
319{ 318{
320 pr_debug("%s(dir=%u, %lu \"%pd\")\n", 319 pr_debug("%s(dir=%lu, %lu \"%pd\")\n", __func__, dir->i_ino,
321 __func__, (u32)dir->i_ino, dentry->d_inode->i_ino, 320 dentry->d_inode->i_ino, dentry);
322 dentry);
323 321
324 return affs_remove_header(dentry); 322 return affs_remove_header(dentry);
325} 323}
@@ -404,8 +402,7 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
404{ 402{
405 struct inode *inode = old_dentry->d_inode; 403 struct inode *inode = old_dentry->d_inode;
406 404
407 pr_debug("%s(%u, %u, \"%pd\")\n", 405 pr_debug("%s(%lu, %lu, \"%pd\")\n", __func__, inode->i_ino, dir->i_ino,
408 __func__, (u32)inode->i_ino, (u32)dir->i_ino,
409 dentry); 406 dentry);
410 407
411 return affs_add_entry(dir, inode, dentry, ST_LINKFILE); 408 return affs_add_entry(dir, inode, dentry, ST_LINKFILE);
@@ -419,9 +416,8 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
419 struct buffer_head *bh = NULL; 416 struct buffer_head *bh = NULL;
420 int retval; 417 int retval;
421 418
422 pr_debug("%s(old=%u,\"%pd\" to new=%u,\"%pd\")\n", 419 pr_debug("%s(old=%lu,\"%pd\" to new=%lu,\"%pd\")\n", __func__,
423 __func__, (u32)old_dir->i_ino, old_dentry, 420 old_dir->i_ino, old_dentry, new_dir->i_ino, new_dentry);
424 (u32)new_dir->i_ino, new_dentry);
425 421
426 retval = affs_check_name(new_dentry->d_name.name, 422 retval = affs_check_name(new_dentry->d_name.name,
427 new_dentry->d_name.len, 423 new_dentry->d_name.len,