Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp777011ybl; Wed, 11 Dec 2019 07:21:59 -0800 (PST) X-Google-Smtp-Source: APXvYqyHagoqkxvL/BxoQzrPF70/6N9LNK2MjkfSTpOm05OHgtK/g26Np5LV/D9UE2UpV9CRRUsM X-Received: by 2002:a05:6830:14d3:: with SMTP id t19mr2790607otq.278.1576077719029; Wed, 11 Dec 2019 07:21:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576077719; cv=none; d=google.com; s=arc-20160816; b=F4WY7HCoV/w811ZlkO2diDmalpRCqtWqhTu4P6h8Q+1Rrjp9kEq793b4Z2cEIZDcJv JTJpTATh+Szmmf+HvlSbKkUugow62iKHsKiTo9GHae7mmXhvwrbIQxMJfGtNxRXNGxOz QdVSO53l1mLk0HtSySh9ZGoPgoqqQXX/e7MkV9VXA0RXX/GffYG323Z2ZE2deN3RvvBk Iy19X09zKPEl8JTNdODIabDWbWMhZcocpYCcnfgW6jnpiSK3j0jI3iYsRP2T6b2eX28X L7AeHFfYA/st1+kNGn4+iwW3wBjx3rXsUaadLYz5y1ughXTDgtbrK1dXMw7jgu1oU5zp iJ8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=O2xX3gxq/PVqcrwBlpvczEIYwZmK0WIKqAgEF0b2TNM=; b=AqEs+GaC5b96l4Mhq1rxj4+lzGIxgSGCAJAzrxXqSqTNJ/cjZV1sfwflOQC36KhVH5 sfqthAHheJiVcywBKuYwZJ7Z/iA4vrpBVFEfWO6+Lj1QDzHtNsD6OCcFxEWbSHK3bawX lsV9ikPd/AiMvHr3nRhwSaF5di7OpY69WOEpvVSiZbyRwjVtkbzK5bGK9GGLdNroh2mi mVAEguX5emPG9NZuly7muZq7isnw/iqkPhDBok45pQlo26I8s6dIcFxSCOKkl2Q0/6qc PQuwfJx9UyEsjxYUDjVAR+Zk9cLQeqTknGPOORh5O8CaBgQtYbEsUksrRUe4tVfnjy2n MkVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="n/U99nas"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q22si1541901otm.304.2019.12.11.07.21.46; Wed, 11 Dec 2019 07:21:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="n/U99nas"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732176AbfLKPUT (ORCPT + 99 others); Wed, 11 Dec 2019 10:20:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:49420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731267AbfLKPUP (ORCPT ); Wed, 11 Dec 2019 10:20:15 -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 8744324658; Wed, 11 Dec 2019 15:20:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077615; bh=mLEWgaRg4QN21zySbsZbDq5eOsEUGBbcPKlCrTYgZ9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/U99nasT/kWq8cJTibmRLeHIjNBag0XaNnnR4CFr2I2snM0+Z46tOSA6Xd0jA+iM qJVTaK2eKgimh01VolPsC1ipNbJ8U7HvNhr7YV8AtBDWiX6TdTjOxqJnbCHva+hgG9 5mRYbonG+jT3vIgYYKIrXSx/YaDjz5tKdFoy5Q/E= 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 104/243] f2fs: change segment to section in f2fs_ioc_gc_range Date: Wed, 11 Dec 2019 16:04:26 +0100 Message-Id: <20191211150346.143738231@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 67b0e42b768c9ddc3fd5ca1aee3db815cfaa635c ] f2fs_ioc_gc_range skips blocks_per_seg each time, however, f2fs_gc moves blocks of section each time, so fix it from segment to section. Signed-off-by: Yunlong Song Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 187bf7e260c99..5eef2a8b29ab6 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2143,7 +2143,7 @@ do_more: } ret = f2fs_gc(sbi, range.sync, true, GET_SEGNO(sbi, range.start)); - range.start += sbi->blocks_per_seg; + range.start += BLKS_PER_SEC(sbi); if (range.start <= end) goto do_more; out: -- 2.20.1