Merge branch 'xfs-unused-args-cleanup' into for-next

diff --cc fs/xfs/xfs_bmap.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
Simple merge