Commit b5071ada authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: remove xfs_blkdev_issue_flush 



It's a one line wrapper around blkdev_issue_flush(). Just replace it
with direct calls to blkdev_issue_flush().

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent a79b28c2

fs/xfs/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1889,7 +1889,7 @@ xfs_free_buftarg( 
	percpu_counter_destroy(&btp->bt_io_count);

	list_lru_destroy(&btp->bt_lru);



	xfs_blkdev_issue_flush(btp);

	blkdev_issue_flush(btp->bt_bdev);



	kmem_free(btp);

}

fs/xfs/xfs_file.c

+3 −3
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ xfs_file_fsync( 
	 * inode size in case of an extending write.

	 */

	if (XFS_IS_REALTIME_INODE(ip))

		xfs_blkdev_issue_flush(mp->m_rtdev_targp);

		blkdev_issue_flush(mp->m_rtdev_targp->bt_bdev);

	else if (mp->m_logdev_targp != mp->m_ddev_targp)

		xfs_blkdev_issue_flush(mp->m_ddev_targp);

		blkdev_issue_flush(mp->m_ddev_targp->bt_bdev);



	/*

	 * Any inode that has dirty modifications in the log is pinned.  The
@@ -219,7 +219,7 @@ xfs_file_fsync( 
	 */

	if (!log_flushed && !XFS_IS_REALTIME_INODE(ip) &&

	    mp->m_logdev_targp == mp->m_ddev_targp)

		xfs_blkdev_issue_flush(mp->m_ddev_targp);

		blkdev_issue_flush(mp->m_ddev_targp->bt_bdev);



	return error;

}

fs/xfs/xfs_log.c

+1 −1
Original line number Diff line number Diff line
@@ -1964,7 +1964,7 @@ xlog_sync( 
	 * layer state machine for preflushes.

	 */

	if (log->l_targ != log->l_mp->m_ddev_targp || split) {

		xfs_blkdev_issue_flush(log->l_mp->m_ddev_targp);

		blkdev_issue_flush(log->l_mp->m_ddev_targp->bt_bdev);

		need_flush = false;

	}

fs/xfs/xfs_super.c

+0 −7
Original line number Diff line number Diff line
@@ -340,13 +340,6 @@ xfs_blkdev_put( 
		blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);

}



void

xfs_blkdev_issue_flush(

	xfs_buftarg_t		*buftarg)

{

	blkdev_issue_flush(buftarg->bt_bdev);

}



STATIC void

xfs_close_devices(

	struct xfs_mount	*mp)

fs/xfs/xfs_super.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ struct xfs_buftarg; 
struct block_device;



extern void xfs_flush_inodes(struct xfs_mount *mp);

extern void xfs_blkdev_issue_flush(struct xfs_buftarg *);

extern xfs_agnumber_t xfs_set_inode_alloc(struct xfs_mount *,

					   xfs_agnumber_t agcount);