From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F10D2C10F14 for ; Thu, 3 Oct 2019 16:37:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC1B9215EA for ; Thu, 3 Oct 2019 16:37:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120654; bh=BpjS6IUJhmox+vBPnpbgrvbr5+HsoBdVE8y3Pth3xdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Q3GhiiXCFAOOjxA8USjCiSoP6Ptq0qUXUux0j5RDbUk5q4/BEuORBT475bqgYHbwD Uu5ugaku+RnqUOiFidkXF1j0AY9/UMAJ9kGPcx+sZOj1aU09F/1zFiHlfDko+8Ntka N55J8BKXxYU/NAH2cMK8Y8bR4qkJufTk6pM8kUHQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403900AbfJCQhd (ORCPT ); Thu, 3 Oct 2019 12:37:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:46872 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404598AbfJCQhb (ORCPT ); Thu, 3 Oct 2019 12:37:31 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A4A392070B; Thu, 3 Oct 2019 16:37:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120651; bh=BpjS6IUJhmox+vBPnpbgrvbr5+HsoBdVE8y3Pth3xdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ja/QYL25RybIR82zNZUBPM1oZwbLUPG4n4xwXw8TPDnl1KrgOTEGuqNMGbMYpcOWm Nl/8hxqETtDzE+ZYnym213HNDvJt1SM0BTUFW4ZhvQKyycHgSfgLwA5Fr4CZWhGyQs D6O0yCRTKogyW+52QkeZxXKAPyo0bPxHnto6OQX4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rakesh Pandit , Theodore Tso , stable@kernel.org Subject: [PATCH 5.2 302/313] ext4: fix warning inside ext4_convert_unwritten_extents_endio Date: Thu, 3 Oct 2019 17:54:40 +0200 Message-Id: <20191003154602.940747713@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rakesh Pandit 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 Signed-off-by: Theodore Ts'o Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- fs/ext4/extents.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3813,8 +3813,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);