| From e3d550c2c4f2f3dba469bc3c4b83d9332b4e99e1 Mon Sep 17 00:00:00 2001 |
| From: Rakesh Pandit <rakesh@tuxera.com> |
| Date: Thu, 22 Aug 2019 22:53:46 -0400 |
| Subject: ext4: fix warning inside ext4_convert_unwritten_extents_endio |
| |
| From: Rakesh Pandit <rakesh@tuxera.com> |
| |
| commit e3d550c2c4f2f3dba469bc3c4b83d9332b4e99e1 upstream. |
| |
| Really enable warning when CONFIG_EXT4_DEBUG is set and fix missing |
| first argument. This was introduced in commit ff95ec22cd7f ("ext4: |
| add warning to ext4_convert_unwritten_extents_endio") and splitting |
| extents inside endio would trigger it. |
| |
| Fixes: ff95ec22cd7f ("ext4: add warning to ext4_convert_unwritten_extents_endio") |
| Signed-off-by: Rakesh Pandit <rakesh@tuxera.com> |
| Signed-off-by: Theodore Ts'o <tytso@mit.edu> |
| Cc: stable@kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/ext4/extents.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/fs/ext4/extents.c |
| +++ b/fs/ext4/extents.c |
| @@ -3755,8 +3755,8 @@ static int ext4_convert_unwritten_extent |
| * illegal. |
| */ |
| if (ee_block != map->m_lblk || ee_len > map->m_len) { |
| -#ifdef EXT4_DEBUG |
| - ext4_warning("Inode (%ld) finished: extent logical block %llu," |
| +#ifdef CONFIG_EXT4_DEBUG |
| + ext4_warning(inode->i_sb, "Inode (%ld) finished: extent logical block %llu," |
| " len %u; IO logical block %llu, len %u", |
| inode->i_ino, (unsigned long long)ee_block, ee_len, |
| (unsigned long long)map->m_lblk, map->m_len); |