diff options
| -rw-r--r-- | fs/ext4/extents.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 2798945a1920..8cacaf645e36 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
| @@ -1682,7 +1682,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, | |||
| 1682 | /* try to insert block into found extent and return */ | 1682 | /* try to insert block into found extent and return */ |
| 1683 | if (ex && !(flag & EXT4_GET_BLOCKS_PRE_IO) | 1683 | if (ex && !(flag & EXT4_GET_BLOCKS_PRE_IO) |
| 1684 | && ext4_can_extents_be_merged(inode, ex, newext)) { | 1684 | && ext4_can_extents_be_merged(inode, ex, newext)) { |
| 1685 | ext_debug("append [%d]%d block to %d:[%d]%d (from %llu)\n", | 1685 | ext_debug("append [%d]%d block to %u:[%d]%d (from %llu)\n", |
| 1686 | ext4_ext_is_uninitialized(newext), | 1686 | ext4_ext_is_uninitialized(newext), |
| 1687 | ext4_ext_get_actual_len(newext), | 1687 | ext4_ext_get_actual_len(newext), |
| 1688 | le32_to_cpu(ex->ee_block), | 1688 | le32_to_cpu(ex->ee_block), |
| @@ -1720,7 +1720,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, | |||
| 1720 | if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block)) | 1720 | if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block)) |
| 1721 | next = ext4_ext_next_leaf_block(path); | 1721 | next = ext4_ext_next_leaf_block(path); |
| 1722 | if (next != EXT_MAX_BLOCKS) { | 1722 | if (next != EXT_MAX_BLOCKS) { |
| 1723 | ext_debug("next leaf block - %d\n", next); | 1723 | ext_debug("next leaf block - %u\n", next); |
| 1724 | BUG_ON(npath != NULL); | 1724 | BUG_ON(npath != NULL); |
| 1725 | npath = ext4_ext_find_extent(inode, next, NULL); | 1725 | npath = ext4_ext_find_extent(inode, next, NULL); |
| 1726 | if (IS_ERR(npath)) | 1726 | if (IS_ERR(npath)) |
| @@ -1758,7 +1758,7 @@ has_space: | |||
| 1758 | 1758 | ||
| 1759 | if (!nearex) { | 1759 | if (!nearex) { |
| 1760 | /* there is no extent in this leaf, create first one */ | 1760 | /* there is no extent in this leaf, create first one */ |
| 1761 | ext_debug("first extent in the leaf: %d:%llu:[%d]%d\n", | 1761 | ext_debug("first extent in the leaf: %u:%llu:[%d]%d\n", |
| 1762 | le32_to_cpu(newext->ee_block), | 1762 | le32_to_cpu(newext->ee_block), |
| 1763 | ext4_ext_pblock(newext), | 1763 | ext4_ext_pblock(newext), |
| 1764 | ext4_ext_is_uninitialized(newext), | 1764 | ext4_ext_is_uninitialized(newext), |
| @@ -1768,8 +1768,8 @@ has_space: | |||
| 1768 | if (le32_to_cpu(newext->ee_block) | 1768 | if (le32_to_cpu(newext->ee_block) |
| 1769 | > le32_to_cpu(nearex->ee_block)) { | 1769 | > le32_to_cpu(nearex->ee_block)) { |
| 1770 | /* Insert after */ | 1770 | /* Insert after */ |
| 1771 | ext_debug("insert %d:%llu:[%d]%d %s before: " | 1771 | ext_debug("insert %u:%llu:[%d]%d before: " |
| 1772 | "nearest 0x%p\n" | 1772 | "nearest %p\n", |
| 1773 | le32_to_cpu(newext->ee_block), | 1773 | le32_to_cpu(newext->ee_block), |
| 1774 | ext4_ext_pblock(newext), | 1774 | ext4_ext_pblock(newext), |
| 1775 | ext4_ext_is_uninitialized(newext), | 1775 | ext4_ext_is_uninitialized(newext), |
| @@ -1779,8 +1779,8 @@ has_space: | |||
| 1779 | } else { | 1779 | } else { |
| 1780 | /* Insert before */ | 1780 | /* Insert before */ |
| 1781 | BUG_ON(newext->ee_block == nearex->ee_block); | 1781 | BUG_ON(newext->ee_block == nearex->ee_block); |
| 1782 | ext_debug("insert %d:%llu:[%d]%d %s after: " | 1782 | ext_debug("insert %u:%llu:[%d]%d after: " |
| 1783 | "nearest 0x%p\n" | 1783 | "nearest %p\n", |
| 1784 | le32_to_cpu(newext->ee_block), | 1784 | le32_to_cpu(newext->ee_block), |
| 1785 | ext4_ext_pblock(newext), | 1785 | ext4_ext_pblock(newext), |
| 1786 | ext4_ext_is_uninitialized(newext), | 1786 | ext4_ext_is_uninitialized(newext), |
| @@ -1789,7 +1789,7 @@ has_space: | |||
| 1789 | } | 1789 | } |
| 1790 | len = EXT_LAST_EXTENT(eh) - nearex + 1; | 1790 | len = EXT_LAST_EXTENT(eh) - nearex + 1; |
| 1791 | if (len > 0) { | 1791 | if (len > 0) { |
| 1792 | ext_debug("insert %d:%llu:[%d]%d: " | 1792 | ext_debug("insert %u:%llu:[%d]%d: " |
| 1793 | "move %d extents from 0x%p to 0x%p\n", | 1793 | "move %d extents from 0x%p to 0x%p\n", |
| 1794 | le32_to_cpu(newext->ee_block), | 1794 | le32_to_cpu(newext->ee_block), |
| 1795 | ext4_ext_pblock(newext), | 1795 | ext4_ext_pblock(newext), |
