From 0efb77a7c7b4243f9a3d32604261843967175db3 Mon Sep 17 00:00:00 2001
From: Dave Chinner <david@fromorbit.com>
Date: Mon, 11 Jan 2010 11:47:47 +0000
Subject: [PATCH] --- yaml --- r: 181788 b: refs/heads/master c:
 b657fc82a3ca6d7ad16a59e81765f0fb0e86cdbb h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/fs/xfs/linux-2.6/xfs_sync.c |  3 ---
 trunk/fs/xfs/xfs_filestream.c     | 14 --------------
 trunk/fs/xfs/xfs_filestream.h     |  1 -
 trunk/fs/xfs/xfs_mru_cache.c      |  2 +-
 trunk/fs/xfs/xfs_mru_cache.h      |  1 -
 6 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index ae1a947a9d8b..b9ee02866324 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fa800fbd549736dfdc1d7761f87e33dc8cd973b
+refs/heads/master: b657fc82a3ca6d7ad16a59e81765f0fb0e86cdbb
diff --git a/trunk/fs/xfs/linux-2.6/xfs_sync.c b/trunk/fs/xfs/linux-2.6/xfs_sync.c
index cc964faf12e9..b58f8412dfe2 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_sync.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_sync.c
@@ -451,9 +451,6 @@ xfs_quiesce_data(
 	xfs_sync_data(mp, SYNC_WAIT);
 	xfs_qm_sync(mp, SYNC_WAIT);
 
-	/* drop inode references pinned by filestreams */
-	xfs_filestream_flush(mp);
-
 	/* write superblock and hoover up shutdown errors */
 	error = xfs_sync_fsdata(mp, SYNC_WAIT);
 
diff --git a/trunk/fs/xfs/xfs_filestream.c b/trunk/fs/xfs/xfs_filestream.c
index 914d00d0f119..390850ee6603 100644
--- a/trunk/fs/xfs/xfs_filestream.c
+++ b/trunk/fs/xfs/xfs_filestream.c
@@ -454,20 +454,6 @@ xfs_filestream_unmount(
 	xfs_mru_cache_destroy(mp->m_filestream);
 }
 
-/*
- * If the mount point's m_perag tree is going to be modified, all
- * outstanding cache entries must be flushed to avoid accessing reference count
- * addresses that have been freed.  The call to xfs_filestream_flush() must be
- * made inside the block that holds the m_perag_lock in write mode to do the
- * reallocation.
- */
-void
-xfs_filestream_flush(
-	xfs_mount_t	*mp)
-{
-	xfs_mru_cache_flush(mp->m_filestream);
-}
-
 /*
  * Return the AG of the filestream the file or directory belongs to, or
  * NULLAGNUMBER otherwise.
diff --git a/trunk/fs/xfs/xfs_filestream.h b/trunk/fs/xfs/xfs_filestream.h
index 58378b2ea033..260f757bbc5d 100644
--- a/trunk/fs/xfs/xfs_filestream.h
+++ b/trunk/fs/xfs/xfs_filestream.h
@@ -135,7 +135,6 @@ int xfs_filestream_init(void);
 void xfs_filestream_uninit(void);
 int xfs_filestream_mount(struct xfs_mount *mp);
 void xfs_filestream_unmount(struct xfs_mount *mp);
-void xfs_filestream_flush(struct xfs_mount *mp);
 xfs_agnumber_t xfs_filestream_lookup_ag(struct xfs_inode *ip);
 int xfs_filestream_associate(struct xfs_inode *dip, struct xfs_inode *ip);
 void xfs_filestream_deassociate(struct xfs_inode *ip);
diff --git a/trunk/fs/xfs/xfs_mru_cache.c b/trunk/fs/xfs/xfs_mru_cache.c
index 4b0613d99faa..45ce15dc5b2b 100644
--- a/trunk/fs/xfs/xfs_mru_cache.c
+++ b/trunk/fs/xfs/xfs_mru_cache.c
@@ -398,7 +398,7 @@ xfs_mru_cache_create(
  * guaranteed that all the free functions for all the elements have finished
  * executing and the reaper is not running.
  */
-void
+static void
 xfs_mru_cache_flush(
 	xfs_mru_cache_t		*mru)
 {
diff --git a/trunk/fs/xfs/xfs_mru_cache.h b/trunk/fs/xfs/xfs_mru_cache.h
index 5d439f34b0c9..36dd3ec8b4eb 100644
--- a/trunk/fs/xfs/xfs_mru_cache.h
+++ b/trunk/fs/xfs/xfs_mru_cache.h
@@ -42,7 +42,6 @@ void xfs_mru_cache_uninit(void);
 int xfs_mru_cache_create(struct xfs_mru_cache **mrup, unsigned int lifetime_ms,
 			     unsigned int grp_count,
 			     xfs_mru_cache_free_func_t free_func);
-void xfs_mru_cache_flush(xfs_mru_cache_t *mru);
 void xfs_mru_cache_destroy(struct xfs_mru_cache *mru);
 int xfs_mru_cache_insert(struct xfs_mru_cache *mru, unsigned long key,
 				void *value);