openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ext4: fix a syntax error in ext4_ext_insert_extent when debugging enabled 

This patch fixes a syntax error which omits a comma. Besides this,
logical block number is unsigend 32 bits, so printk should use %u
instead %d.

Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Yongqiang Yang 2011-11-01 18:56:41 -04:00 committed by Theodore Ts'o
parent ff3fc1736f
commit 32de675690
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/ext4/extents.c
View File

@ -1682,7 +1682,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
/* try to insert block into found extent and return */ /* try to insert block into found extent and return */
if (ex && !(flag & EXT4_GET_BLOCKS_PRE_IO) if (ex && !(flag & EXT4_GET_BLOCKS_PRE_IO)
&& ext4_can_extents_be_merged(inode, ex, newext)) { && ext4_can_extents_be_merged(inode, ex, newext)) {
ext_debug("append [%d]%d block to %d:[%d]%d (from %llu)\n", ext_debug("append [%d]%d block to %u:[%d]%d (from %llu)\n",
ext4_ext_is_uninitialized(newext), ext4_ext_is_uninitialized(newext),
ext4_ext_get_actual_len(newext), ext4_ext_get_actual_len(newext),
le32_to_cpu(ex->ee_block), le32_to_cpu(ex->ee_block),
@ -1720,7 +1720,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block)) if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block))
next = ext4_ext_next_leaf_block(path); next = ext4_ext_next_leaf_block(path);
if (next != EXT_MAX_BLOCKS) { if (next != EXT_MAX_BLOCKS) {
ext_debug("next leaf block - %d\n", next); ext_debug("next leaf block - %u\n", next);
BUG_ON(npath != NULL); BUG_ON(npath != NULL);
npath = ext4_ext_find_extent(inode, next, NULL); npath = ext4_ext_find_extent(inode, next, NULL);
if (IS_ERR(npath)) if (IS_ERR(npath))
@ -1758,7 +1758,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
if (!nearex) { if (!nearex) {
/* there is no extent in this leaf, create first one */ /* there is no extent in this leaf, create first one */
ext_debug("first extent in the leaf: %d:%llu:[%d]%d\n", ext_debug("first extent in the leaf: %u:%llu:[%d]%d\n",
le32_to_cpu(newext->ee_block), le32_to_cpu(newext->ee_block),
ext4_ext_pblock(newext), ext4_ext_pblock(newext),
ext4_ext_is_uninitialized(newext), ext4_ext_is_uninitialized(newext),
@ -1768,8 +1768,8 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
if (le32_to_cpu(newext->ee_block) if (le32_to_cpu(newext->ee_block)
> le32_to_cpu(nearex->ee_block)) { > le32_to_cpu(nearex->ee_block)) {
/* Insert after */ /* Insert after */
ext_debug("insert %d:%llu:[%d]%d %s before: " ext_debug("insert %u:%llu:[%d]%d before: "
"nearest 0x%p\n" "nearest %p\n",
le32_to_cpu(newext->ee_block), le32_to_cpu(newext->ee_block),
ext4_ext_pblock(newext), ext4_ext_pblock(newext),
ext4_ext_is_uninitialized(newext), ext4_ext_is_uninitialized(newext),
@ -1779,8 +1779,8 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
} else { } else {
/* Insert before */ /* Insert before */
BUG_ON(newext->ee_block == nearex->ee_block); BUG_ON(newext->ee_block == nearex->ee_block);
ext_debug("insert %d:%llu:[%d]%d %s after: " ext_debug("insert %u:%llu:[%d]%d after: "
"nearest 0x%p\n" "nearest %p\n",
le32_to_cpu(newext->ee_block), le32_to_cpu(newext->ee_block),
ext4_ext_pblock(newext), ext4_ext_pblock(newext),
ext4_ext_is_uninitialized(newext), ext4_ext_is_uninitialized(newext),
@ -1789,7 +1789,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
} }
len = EXT_LAST_EXTENT(eh) - nearex + 1; len = EXT_LAST_EXTENT(eh) - nearex + 1;
if (len > 0) { if (len > 0) {
ext_debug("insert %d:%llu:[%d]%d: " ext_debug("insert %u:%llu:[%d]%d: "
"move %d extents from 0x%p to 0x%p\n", "move %d extents from 0x%p to 0x%p\n",
le32_to_cpu(newext->ee_block), le32_to_cpu(newext->ee_block),
ext4_ext_pblock(newext), ext4_ext_pblock(newext),