From 139548616a26719c940dd30cb5ca73c10d1d6f28 Mon Sep 17 00:00:00 2001
From: Ben Myers <bpm@sgi.com>
Date: Thu, 13 Sep 2012 16:18:47 -0500
Subject: [PATCH] --- yaml --- r: 323044 b: refs/heads/master c:
 0ba6e5368c302819da7aff537e0d7eff2616c6a6 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/xfs/xfs_super.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 819073deca45..e603e2adf93a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fb8a90aa3f2319a25f3396b1e9273300f8903b8
+refs/heads/master: 0ba6e5368c302819da7aff537e0d7eff2616c6a6
diff --git a/trunk/fs/xfs/xfs_super.c b/trunk/fs/xfs/xfs_super.c
index bdaf4cb9f4a2..19e2380fb867 100644
--- a/trunk/fs/xfs/xfs_super.c
+++ b/trunk/fs/xfs/xfs_super.c
@@ -919,6 +919,7 @@ xfs_fs_put_super(
 	struct xfs_mount	*mp = XFS_M(sb);
 
 	xfs_filestream_unmount(mp);
+	cancel_delayed_work_sync(&mp->m_sync_work);
 	xfs_unmountfs(mp);
 	xfs_syncd_stop(mp);
 	xfs_freesb(mp);