Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / xfs / xfs_mru_cache.c

diff --git a/fs/xfs/xfs_mru_cache.c b/fs/xfs/xfs_mru_cache.c
index 45ce15dc5b2b05a7447e6ad2a9834dd0bf5b6dec..edfa178bafb62e4d147dc74ba9593b622231c25d 100644 (file)
--- a/fs/xfs/xfs_mru_cache.c
+++ b/fs/xfs/xfs_mru_cache.c
@@ -408,7 +408,7 @@ xfs_mru_cache_flush(
        spin_lock(&mru->lock);
        if (mru->queued) {
                spin_unlock(&mru->lock);
-               cancel_rearming_delayed_workqueue(xfs_mru_reap_wq, &mru->work);
+               cancel_delayed_work_sync(&mru->work);
                spin_lock(&mru->lock);
        }