b=21656 Quiet dirty_max CERROR

 The atomic_read() allowing the atomic_inc() are not covered
 by a lock. Thus they may safely race and trip this CERROR()
 unless we add in a small fudge factor (+1).

 i=adilger
 i=dmitry.zogin

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 587656c..df25025 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -715,7 +715,10 @@ static void osc_announce_cached(struct client_obd *cli, struct obdo *oa,
                 CERROR("dirty %lu > dirty_max %lu\n",
                        cli->cl_dirty, cli->cl_dirty_max);
                 oa->o_undirty = 0;
-        } else if (atomic_read(&obd_dirty_pages) > obd_max_dirty_pages) {
+        } else if (atomic_read(&obd_dirty_pages) > obd_max_dirty_pages + 1) {
+                /* The atomic_read() allowing the atomic_inc() are not covered
+                 * by a lock thus they may safely race and trip this CERROR()
+                 * unless we add in a small fudge factor (+1). */
                 CERROR("dirty %d > system dirty_max %d\n",
                        atomic_read(&obd_dirty_pages), obd_max_dirty_pages);
                 oa->o_undirty = 0;