diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-05-31 06:03:21 +0200 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-06-03 17:12:24 +0200 |
| commit | cf610bf4199770420629d3bc273494bd27ad6c1d (patch) | |
| tree | 76418cad3b35d8b40090ae13d5100de598e6c4cb /fs/ubifs/shrinker.c | |
| parent | UBIFS: fix recovery broken by the previous recovery fix (diff) | |
| download | linux-cf610bf4199770420629d3bc273494bd27ad6c1d.tar.xz linux-cf610bf4199770420629d3bc273494bd27ad6c1d.zip | |
UBIFS: fix shrinker object count reports
Sometimes VM asks the shrinker to return amount of objects it can shrink,
and we return the ubifs_clean_zn_cnt in that case. However, it is possible
that this counter is negative for a short period of time, due to the way
UBIFS TNC code updates it. And I can observe the following warnings sometimes:
shrink_slab: ubifs_shrinker+0x0/0x2b7 [ubifs] negative objects to delete nr=-8541616642706119788
This patch makes sure UBIFS never returns negative count of objects.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: stable@kernel.org
Diffstat (limited to 'fs/ubifs/shrinker.c')
| -rw-r--r-- | fs/ubifs/shrinker.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ubifs/shrinker.c b/fs/ubifs/shrinker.c index ca953a945029..9e1d05666fed 100644 --- a/fs/ubifs/shrinker.c +++ b/fs/ubifs/shrinker.c @@ -284,7 +284,11 @@ int ubifs_shrinker(struct shrinker *shrink, struct shrink_control *sc) long clean_zn_cnt = atomic_long_read(&ubifs_clean_zn_cnt); if (nr == 0) - return clean_zn_cnt; + /* + * Due to the way UBIFS updates the clean znode counter it may + * temporarily be negative. + */ + return clean_zn_cnt >= 0 ? clean_zn_cnt : 1; if (!clean_zn_cnt) { /* |