From patchwork Tue Nov 3 20:31:42 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: 316752 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 592DCC388F9 for ; Tue, 3 Nov 2020 22:09:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 18F9320665 for ; Tue, 3 Nov 2020 22:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604441364; bh=uCi6hxQDvP2HZ0G4w/QBc02pdvdfVrTEfBixI52DHms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u6c1t4gOkyMgSzvAq7jaAkmUXr3etE6zu6cgs88Ql9UOQUVdClT1aXl77nfAZKpN0 Dgarkxeq5LdMA6Xm2zE7r/5cedh4fAh+NN3aNKE/6c/lLxhj4KCc3XHsuyrN2vo6KJ sz8sPNXnkP52vjhUAlGMXO6hj6FaBmzg+ihGQ1To= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729669AbgKCUjp (ORCPT ); Tue, 3 Nov 2020 15:39:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:50722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729438AbgKCUjn (ORCPT ); Tue, 3 Nov 2020 15:39:43 -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 92CDE2224E; Tue, 3 Nov 2020 20:39:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604435983; bh=uCi6hxQDvP2HZ0G4w/QBc02pdvdfVrTEfBixI52DHms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EKprvTjAgWVpJoCC4oSCBuMGOAWAW+Khwfy6+BDmEr/kUHtbIyQ1CPmoeKEHNW9HH zE6BdPLe++43M7zTdhw2DNnuEMGKyl5TXwYMg3prOSH0wRxZcgfQolxMoZJuQiw6YG df40WSsw634mTGMD/GI5NE6aH300i+tyomcvW6Ro= 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 5.9 051/391] f2fs: add trace exit in exception path Date: Tue, 3 Nov 2020 21:31:42 +0100 Message-Id: <20201103203350.944197452@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@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 ff807e14c8911..bf190a718ca6c 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1047,8 +1047,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]);