summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRakesh Pandit <rakesh@tuxera.com>2019-08-22 22:53:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-05 13:10:11 +0200
commit775e3e734bd35fa4d11bc0d9abb91a44815bacaa (patch)
tree97486638dcb63597c11e467e6e0caf490cd84dd4 /fs
parentcaa6926d94f12768706fe580fca211fceb3cfddf (diff)
downloadlinux-stable-775e3e734bd35fa4d11bc0d9abb91a44815bacaa.tar.gz
linux-stable-775e3e734bd35fa4d11bc0d9abb91a44815bacaa.tar.bz2
linux-stable-775e3e734bd35fa4d11bc0d9abb91a44815bacaa.zip
ext4: fix warning inside ext4_convert_unwritten_extents_endio
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/extents.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 00bf0b67aae8..f81eb1785af2 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -3748,8 +3748,8 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle,
* 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);