diff options
author | Maksym Planeta <mcsim.planeta@gmail.com> | 2012-10-06 14:33:28 +0300 |
---|---|---|
committer | Maksym Planeta <mcsim.planeta@gmail.com> | 2012-10-07 21:30:47 +0300 |
commit | 511174a00d4d174a221947eb6c361de551035178 (patch) | |
tree | dfcac0fc06d05d383154aed58acbe2ee21064490 | |
parent | 87bb398fa2b73bd7ec0993d0d9646bf43bd82782 (diff) |
Fix printf format in debugging macros.
This commit removes compiling warnings when debug macros are enabled.
* ext2fs/getblk.c (ext2_discard_prealloc): Fix format.
* ext2fs/ialloc.c (diskfs_free_node): Likewise.
* ext2fs/inode.c (write_node): Likewise.
* ext2fs/pager.c (pending_blocks_write): Likewise.
(file_pager_write_page): Likewise.
(disk_pager_write_page): Likewise.
(diskfs_grow): Likewise.
-rw-r--r-- | ext2fs/getblk.c | 2 | ||||
-rw-r--r-- | ext2fs/ialloc.c | 2 | ||||
-rw-r--r-- | ext2fs/inode.c | 2 | ||||
-rw-r--r-- | ext2fs/pager.c | 16 |
4 files changed, 11 insertions, 11 deletions
diff --git a/ext2fs/getblk.c b/ext2fs/getblk.c index 23ba6459..3da4671e 100644 --- a/ext2fs/getblk.c +++ b/ext2fs/getblk.c @@ -52,7 +52,7 @@ ext2_discard_prealloc (struct node *node) if (node->dn->info.i_prealloc_count) { int i = node->dn->info.i_prealloc_count; - ext2_debug ("discarding %d prealloced blocks for inode %d", + ext2_debug ("discarding %d prealloced blocks for inode %Ld", i, node->cache_id); node->dn->info.i_prealloc_count = 0; ext2_free_blocks (node->dn->info.i_prealloc_block, i); diff --git a/ext2fs/ialloc.c b/ext2fs/ialloc.c index 6ba75822..2c61c723 100644 --- a/ext2fs/ialloc.c +++ b/ext2fs/ialloc.c @@ -60,7 +60,7 @@ diskfs_free_node (struct node *np, mode_t old_mode) assert (!diskfs_readonly); - ext2_debug ("freeing inode %u", inum); + ext2_debug ("freeing inode %Lu", inum); spin_lock (&global_lock); diff --git a/ext2fs/inode.c b/ext2fs/inode.c index f25cc1fa..9447723d 100644 --- a/ext2fs/inode.c +++ b/ext2fs/inode.c @@ -419,7 +419,7 @@ write_node (struct node *np) assert (!diskfs_readonly); - ext2_debug ("writing inode %d to disk", np->cache_id); + ext2_debug ("writing inode %Ld to disk", np->cache_id); err = diskfs_catch_exception (); if (err) diff --git a/ext2fs/pager.c b/ext2fs/pager.c index 0136f9b1..6540be04 100644 --- a/ext2fs/pager.c +++ b/ext2fs/pager.c @@ -298,7 +298,7 @@ pending_blocks_write (struct pending_blocks *pb) block_t dev_block = pb->block << log2_dev_blocks_per_fs_block; size_t length = pb->num << log2_block_size, amount; - ext2_debug ("writing block %u[%ld]", pb->block, pb->num); + ext2_debug ("writing block %u[%Ld]", pb->block, pb->num); if (pb->offs > 0) /* Put what we're going to write into a page-aligned buffer. */ @@ -381,7 +381,7 @@ file_pager_write_page (struct node *node, vm_offset_t offset, void *buf) else if (offset + left > node->allocsize) left = node->allocsize - offset; - ext2_debug ("writing inode %d page %d[%d]", node->cache_id, offset, left); + ext2_debug ("writing inode %Ld page %lu[%d]", node->cache_id, offset, left); STAT_INC (file_pageouts); @@ -435,7 +435,7 @@ disk_pager_write_page (vm_offset_t page, void *buf) if (page + vm_page_size > dev_end) length = dev_end - page; - ext2_debug ("writing disk page %d[%d]", page, length); + ext2_debug ("writing disk page %ld[%zd]", page, length); STAT_INC (disk_pageouts); @@ -619,8 +619,8 @@ diskfs_grow (struct node *node, off_t size, struct protid *cred) block_t old_page_end_block = round_page (old_size) >> log2_block_size; - ext2_debug ("growing inode %d to %lu bytes (from %lu)", node->cache_id, - new_size, old_size); + ext2_debug ("growing inode %Ld to %Lu bytes (from %Lu)", + node->cache_id, new_size, old_size); if (dn->last_page_partially_writable && old_page_end_block > end_block) @@ -630,7 +630,7 @@ diskfs_grow (struct node *node, off_t size, struct protid *cred) ? new_end_block : old_page_end_block); - ext2_debug ("extending writable page %u by %d blocks" + ext2_debug ("extending writable page %lu by %d blocks" "; first new block = %u", trunc_page (old_size), writable_end - end_block, @@ -656,11 +656,11 @@ diskfs_grow (struct node *node, off_t size, struct protid *cred) STAT_INC (file_grows); - ext2_debug ("new size: %ld%s.", new_size, + ext2_debug ("new size: %Lu%s.", new_size, dn->last_page_partially_writable ? " (last page writable)": ""); if (err) - ext2_warning ("inode=%Ld, target=%Ld: %s", + ext2_warning ("inode=%Ld, target=%Lu: %s", node->cache_id, new_size, strerror (err)); node->allocsize = new_size; |