diff options
| author | Zhang Yi <yi.zhang@huawei.com> | 2021-05-22 13:30:45 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-20 17:17:28 +0300 |
| commit | 72a1c16e982081462123d34430b17e45f61c38ff (patch) | |
| tree | 5b5c312c07208a5bdea3048ccb6b69f66eef5a80 | |
| parent | 29d882f9a6a6219a1c59729e1f43fa40663903e4 (diff) | |
| download | linux-72a1c16e982081462123d34430b17e45f61c38ff.tar.xz | |
ext4: correct the cache_nr in tracepoint ext4_es_shrink_exit
commit 4fb7c70a889ead2e91e184895ac6e5354b759135 upstream.
The cache_cnt parameter of tracepoint ext4_es_shrink_exit means the
remaining cache count after shrink, but now it is the cache count before
shrink, fix it by read sbi->s_extent_cache_cnt again.
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-3-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/ext4/extents_status.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 763ef185dd17..40e9fe5e8fbb 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -1086,6 +1086,7 @@ static unsigned long ext4_es_scan(struct shrinker *shrink, nr_shrunk = __es_shrink(sbi, nr_to_scan, NULL); + ret = percpu_counter_read_positive(&sbi->s_es_stats.es_stats_shk_cnt); trace_ext4_es_shrink_scan_exit(sbi->s_sb, nr_shrunk, ret); return nr_shrunk; } |