Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b657fc82 authored by Dave Chinner's avatar Dave Chinner Committed by Alex Elder
Browse files

xfs: Kill filestreams cache flush 



The filestreams cache flush is not needed in the sync code as it
does not affect data writeback, and it is now not used by the growfs
code, either, so kill it.

Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 0fa800fb

fs/xfs/linux-2.6/xfs_sync.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_filestream.c

+0 −14
Original line number Diff line number Diff line
@@ -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.

fs/xfs/xfs_filestream.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_mru_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

fs/xfs/xfs_mru_cache.h

+0 −1
Original line number Diff line number Diff line
@@ -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);