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

Commit a9add83e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove XFS_bflush 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 02b102df

fs/xfs/xfs_buf.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -294,6 +294,4 @@ extern int xfs_flush_buftarg(xfs_buftarg_t *, int); 
#define xfs_getsize_buftarg(buftarg)	block_size((buftarg)->bt_bdev)

#define xfs_getsize_buftarg(buftarg)	block_size((buftarg)->bt_bdev)

#define xfs_readonly_buftarg(buftarg)	bdev_read_only((buftarg)->bt_bdev)

#define xfs_readonly_buftarg(buftarg)	bdev_read_only((buftarg)->bt_bdev)





#define XFS_bflush(buftarg)		xfs_flush_buftarg(buftarg, 1)



#endif	/* __XFS_BUF_H__ */
 
#endif	/* __XFS_BUF_H__ */

fs/xfs/xfs_log_recover.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3654,7 +3654,7 @@ xlog_do_recover( 
		return error;

		return error;

	}

	}





	XFS_bflush(log->l_mp->m_ddev_targp);

	xfs_flush_buftarg(log->l_mp->m_ddev_targp, 1);





	/*

	/*

	 * If IO errors happened during recovery, bail out.

	 * If IO errors happened during recovery, bail out.

fs/xfs/xfs_mount.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1481,7 +1481,7 @@ xfs_unmountfs( 
	 * state as much as possible.

	 * state as much as possible.

	 */

	 */

	xfs_reclaim_inodes(mp, 0);

	xfs_reclaim_inodes(mp, 0);

	XFS_bflush(mp->m_ddev_targp);

	xfs_flush_buftarg(mp->m_ddev_targp, 1);

	xfs_reclaim_inodes(mp, SYNC_WAIT);

	xfs_reclaim_inodes(mp, SYNC_WAIT);





	xfs_qm_unmount(mp);

	xfs_qm_unmount(mp);

fs/xfs/xfs_qm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1681,7 +1681,7 @@ xfs_qm_quotacheck( 
	 * quotacheck'd stamp on the superblock. So, here we do a synchronous

	 * quotacheck'd stamp on the superblock. So, here we do a synchronous

	 * flush.

	 * flush.

	 */

	 */

	XFS_bflush(mp->m_ddev_targp);

	xfs_flush_buftarg(mp->m_ddev_targp, 1);





	/*

	/*

	 * If one type of quotas is off, then it will lose its

	 * If one type of quotas is off, then it will lose its

fs/xfs/xfs_super.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1015,7 +1015,7 @@ xfs_fs_put_super( 
	 */

	 */

	xfs_filestream_unmount(mp);

	xfs_filestream_unmount(mp);





	XFS_bflush(mp->m_ddev_targp);

	xfs_flush_buftarg(mp->m_ddev_targp, 1);





	xfs_unmountfs(mp);

	xfs_unmountfs(mp);

	xfs_freesb(mp);

	xfs_freesb(mp);
@@ -1439,7 +1439,7 @@ xfs_fs_fill_super( 
	 */

	 */

	xfs_filestream_unmount(mp);

	xfs_filestream_unmount(mp);





	XFS_bflush(mp->m_ddev_targp);

	xfs_flush_buftarg(mp->m_ddev_targp, 1);





	xfs_unmountfs(mp);

	xfs_unmountfs(mp);

	goto out_free_sb;

	goto out_free_sb;