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=-9.8 required=3.0 tests=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 20D4EC43603 for ; Wed, 11 Dec 2019 15:52:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5EDB2077B for ; Wed, 11 Dec 2019 15:52:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576079575; bh=II/JMcXjMWKwFOlzpxd6eDehf5wxlKEZ6EEwjEZh4yI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RcaziJ/ArsmbBZgIxvXSptbxh3WW8o05WPM7GU2qreAdcjeiK9c5Lt8nI82aaXlsX EQ1IKGaiSxe7iOz++8B9lVLB7/Mu4N8MJ3ZanE+HOrITzCKNcAUN7Oq67Ea9HTaYt0 xGiHAOHFLW+qTJJlltY+s1axDRSYsXp3ubrkWrlA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732844AbfLKPwx (ORCPT ); Wed, 11 Dec 2019 10:52:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:49318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732085AbfLKPUN (ORCPT ); Wed, 11 Dec 2019 10:20:13 -0500 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 0F64A24654; Wed, 11 Dec 2019 15:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077612; bh=II/JMcXjMWKwFOlzpxd6eDehf5wxlKEZ6EEwjEZh4yI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RIJMmvJQ5E3DX5jLJ6XExB8kiDdeXRcXvajGnPbwnIvd9Mp7uneZTiBILAxK2WkbY tXoSjtlww0KTSMPlz+oGqNrNaHmsfuIb48oBKygjRKzEPTu50afGDIEVK57BYh9TeC uuF40C9y788qH0doMa7N1HslINtjnxw9hNskMuQM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yunlong Song , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.19 103/243] f2fs: fix count of seg_freed to make sec_freed correct Date: Wed, 11 Dec 2019 16:04:25 +0100 Message-Id: <20191211150346.073214531@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@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: Yunlong Song [ Upstream commit d6c66cd19ef322fe0d51ba09ce1b7f386acab04a ] When sbi->segs_per_sec > 1, and if some segno has 0 valid blocks before gc starts, do_garbage_collect will skip counting seg_freed++, and this will cause seg_freed < sbi->segs_per_sec and finally skip sec_freed++. Signed-off-by: Yunlong Song Signed-off-by: Chao Yu Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/gc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 8c4cb1eee10a6..3d98e909201d9 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -1081,9 +1081,9 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, GET_SUM_BLOCK(sbi, segno)); f2fs_put_page(sum_page, 0); - if (get_valid_blocks(sbi, segno, false) == 0 || - !PageUptodate(sum_page) || - unlikely(f2fs_cp_error(sbi))) + if (get_valid_blocks(sbi, segno, false) == 0) + goto freed; + if (!PageUptodate(sum_page) || unlikely(f2fs_cp_error(sbi))) goto next; sum = page_address(sum_page); @@ -1110,6 +1110,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, stat_inc_seg_count(sbi, type, gc_type); +freed: if (gc_type == FG_GC && get_valid_blocks(sbi, segno, false) == 0) seg_freed++; -- 2.20.1