fs/writeback: only calculate dirtied_before when b_io is empty

[linux-block.git] / fs / fs-writeback.c

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index a754eb25453576921533504121878d50b69d2e50..cbfb3e05e1206ac5f237ece6453824ebacc8356a 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -2105,20 +2105,21 @@ static long wb_writeback(struct bdi_writeback *wb,
 
                spin_lock(&wb->list_lock);
 
-               /*
-                * Kupdate and background works are special and we want to
-                * include all inodes that need writing. Livelock avoidance is
-                * handled by these works yielding to any other work so we are
-                * safe.
-                */
-               if (work->for_kupdate) {
-                       dirtied_before = jiffies -
-                               msecs_to_jiffies(dirty_expire_interval * 10);
-               } else if (work->for_background)
-                       dirtied_before = jiffies;
-
                trace_writeback_start(wb, work);
                if (list_empty(&wb->b_io)) {
+                       /*
+                        * Kupdate and background works are special and we want
+                        * to include all inodes that need writing. Livelock
+                        * avoidance is handled by these works yielding to any
+                        * other work so we are safe.
+                        */
+                       if (work->for_kupdate) {
+                               dirtied_before = jiffies -
+                                       msecs_to_jiffies(dirty_expire_interval *
+                                                        10);
+                       } else if (work->for_background)
+                               dirtied_before = jiffies;
+
                        queue_io(wb, work, dirtied_before);
                        queued = true;
                }