diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-30 10:52:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-30 10:52:02 +0100 |
| commit | 9e5b0b8650adec15dddcacf930b0e4aa4142680a (patch) | |
| tree | 067d1c00cf9ee35cb9e08e0e5664e7763a807cf7 /drivers/staging/lustre/lustre/osc/osc_cache.c | |
| parent | 08556e03ad36b2c6219aba90de88ccf58038e208 (diff) | |
| parent | 5b90d559d4d5c8fd2127013666014595caa53ae2 (diff) | |
Merge tag 'v4.9.104' into linux-linaro-lsk-v4.9
This is the 4.9.104 stable release
Diffstat (limited to 'drivers/staging/lustre/lustre/osc/osc_cache.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/osc/osc_cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c index 4bbe219add98..1a8c9f535200 100644 --- a/drivers/staging/lustre/lustre/osc/osc_cache.c +++ b/drivers/staging/lustre/lustre/osc/osc_cache.c @@ -1542,7 +1542,7 @@ static int osc_enter_cache_try(struct client_obd *cli, if (rc < 0) return 0; - if (cli->cl_dirty_pages <= cli->cl_dirty_max_pages && + if (cli->cl_dirty_pages < cli->cl_dirty_max_pages && atomic_long_read(&obd_dirty_pages) + 1 <= obd_max_dirty_pages) { osc_consume_write_grant(cli, &oap->oap_brw_page); if (transient) { |