Apply preempt_rt patch-4.9-rt1.patch.xz

[zynq/linux.git] / fs / btrfs / async-thread.c

diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index e0f071f6b5a761faa6a00b741017a759c91e100a..6f4631bf74f850b78ea8fdb837496152253948da 100644 (file)
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -288,8 +288,8 @@ static void run_ordered_work(struct __btrfs_workqueue *wq)
                 * we don't want to call the ordered free functions
                 * with the lock held though
                 */
-               work->ordered_free(work);
                trace_btrfs_all_work_done(work);
+               work->ordered_free(work);
        }
        spin_unlock_irqrestore(lock, flags);
 }
@@ -318,8 +318,6 @@ static void normal_work_helper(struct btrfs_work *work)
                set_bit(WORK_DONE_BIT, &work->flags);
                run_ordered_work(wq);
        }
-       if (!need_order)
-               trace_btrfs_all_work_done(work);
 }
 
 void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t uniq_func,