From patchwork Tue Nov 3 20:35:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 316955 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 07DECC388F7 for ; Tue, 3 Nov 2020 21:25:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B5B0D20757 for ; Tue, 3 Nov 2020 21:25:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604438702; bh=jl9siiztROZz5SkfbiMIwUbKaF9tvMxIU5H2VKHFOhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SZJgOda7H5k0M5jkKkmE1UWDgjtt351ipOZViAJCGfidmVfAwuku6kQhniVuxi9ym n8eBiHt69du4+LIW8Ghh6nfkLuFcjzzgED8R4oEDm9Az3Faxc4iC7RVhR6c1buDfaz 7A2nPciCH9dOvB8Qr+BznIokCwl6U5YdflrVDsMs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733087AbgKCVDP (ORCPT ); Tue, 3 Nov 2020 16:03:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:40612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387728AbgKCVDN (ORCPT ); Tue, 3 Nov 2020 16:03:13 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 CD83F206B5; Tue, 3 Nov 2020 21:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437393; bh=jl9siiztROZz5SkfbiMIwUbKaF9tvMxIU5H2VKHFOhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iL9WjKJxZSMOPQ5VsInJT2PZ9nhnc8bQRfvwWwNCeJrKeTMwD298uYeAoVO9E327o Nz6diy4qzrQ1J4Mrh8jSn/Vd0SPa7U6uFGNH1k3NHcy4dzs2KPCDlnkxD0nHxFxarg 11/O+dtbr804nQnBQ8MUqdXTBNbLJXG3+FFFyecU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhang Qilong , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.19 058/191] f2fs: add trace exit in exception path Date: Tue, 3 Nov 2020 21:35:50 +0100 Message-Id: <20201103203240.191486878@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhang Qilong [ Upstream commit 9b66482282888d02832b7d90239e1cdb18e4b431 ] Missing the trace exit in f2fs_sync_dirty_inodes Signed-off-by: Zhang Qilong Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/checkpoint.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 388500eec7291..d412fc150988c 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1003,8 +1003,12 @@ int f2fs_sync_dirty_inodes(struct f2fs_sb_info *sbi, enum inode_type type) get_pages(sbi, is_dir ? F2FS_DIRTY_DENTS : F2FS_DIRTY_DATA)); retry: - if (unlikely(f2fs_cp_error(sbi))) + if (unlikely(f2fs_cp_error(sbi))) { + trace_f2fs_sync_dirty_inodes_exit(sbi->sb, is_dir, + get_pages(sbi, is_dir ? + F2FS_DIRTY_DENTS : F2FS_DIRTY_DATA)); return -EIO; + } spin_lock(&sbi->inode_lock[type]);