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

[mv-sheeva.git] / fs / ocfs2 / cluster / quorum.c

diff --git a/fs/ocfs2/cluster/quorum.c b/fs/ocfs2/cluster/quorum.c
index cf3e16696216d4fa95f30c0247ee58e608f54047..a87366750f23ae1f97719661e067acaa1b077604 100644 (file)
--- a/fs/ocfs2/cluster/quorum.c
+++ b/fs/ocfs2/cluster/quorum.c
@@ -325,5 +325,7 @@ void o2quo_init(void)
 
 void o2quo_exit(void)
 {
-       flush_scheduled_work();
+       struct o2quo_state *qs = &o2quo_state;
+
+       flush_work_sync(&qs->qs_work);
 }