ext4: remove check for zero nr_to_scan in ext4_es_scan()
authorZhang Yi <yi.zhang@huawei.com>
Sat, 22 May 2021 10:30:44 +0000 (18:30 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:17:28 +0000 (16:17 +0200)
commit e5e7010e5444d923e4091cafff61d05f2d19cada upstream.

After converting fs shrinkers to new scan/count API, we are no longer
pass zero nr_to_scan parameter to detect the number of objects to free,
just remove this check.

Fixes: 1ab6c4997e04 ("fs: convert fs shrinkers to new scan/count API")
Cc: stable@vger.kernel.org # 3.12+
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210522103045.690103-2-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ext4/extents_status.c

index 40e9fe5e8fbb3545be36bd23022fd8de4b5dd071..e89be95a4c8c140c7c97e3cbc3540e28a91f78c1 100644 (file)
@@ -1081,9 +1081,6 @@ static unsigned long ext4_es_scan(struct shrinker *shrink,
        ret = percpu_counter_read_positive(&sbi->s_es_stats.es_stats_shk_cnt);
        trace_ext4_es_shrink_scan_enter(sbi->s_sb, nr_to_scan, ret);
 
-       if (!nr_to_scan)
-               return ret;
-
        nr_shrunk = __es_shrink(sbi, nr_to_scan, NULL);
 
        ret = percpu_counter_read_positive(&sbi->s_es_stats.es_stats_shk_cnt);