From patchwork Mon Nov 9 12:54:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 322608 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 961D3C4741F for ; Mon, 9 Nov 2020 13:38:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46D4C206CB for ; Mon, 9 Nov 2020 13:38:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604929139; bh=gB8obUv6WNp1jhhZllmd3FJBO+me5pu0XTCl/9bAw3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eBU5+5bMt61H3ws8HXIJV9MHr8dDT807So6pSxcxuoRm8g6/+Ft9iOXQR5yQThCnB yx2p05Fsv2eYkHTpcwS+wf03l6XCg817skKOrHU9qLQ/GwYGVht1S6vlDOC/7RqJ3e bVz8VA+9lzIiZ+IrMqhW2DGP5HD6Ycffoy+o1yoM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730659AbgKINiR (ORCPT ); Mon, 9 Nov 2020 08:38:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:55932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730614AbgKINB6 (ORCPT ); Mon, 9 Nov 2020 08:01:58 -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 D53BA206C0; Mon, 9 Nov 2020 13:01:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604926917; bh=gB8obUv6WNp1jhhZllmd3FJBO+me5pu0XTCl/9bAw3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sIeu2QLgUmXYYauJTcWjJGshX0CMLa89zCMfZgwABGI+/RWLoftg4PXwyhdsTHscO CK1F5L8CykLr+KWovQ7rCf0taJxO3EVEk5vwmKcmPEmaiCqrYl2hM+3JfAToSsjyWh z38InwOLABTchUMNrtApzdRhPqyrikiKigPWoTzg= 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.9 018/117] f2fs: add trace exit in exception path Date: Mon, 9 Nov 2020 13:54:04 +0100 Message-Id: <20201109125026.512041324@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125025.630721781@linuxfoundation.org> References: <20201109125025.630721781@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 0b061bbf1639a..c1b24d7aa6ef1 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -904,8 +904,12 @@ int 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]);