Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next

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

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

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

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