Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next

Conflicts:
	fs/xfs/libxfs/xfs_bmap.c
	fs/xfs/xfs_inode.c

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

diff --cc fs/xfs/xfs_inode.c
index 8394f6f17120c7fd475bd405446ad24a1b3bc2af,b7064f20de7f3b5497c7d7c4d1d44a4ef52438ed..d6ebc85192b7b3f4fd21e3cbc25ccb5f54501319
--- 1/fs/xfs/xfs_inode.c
--- 2/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@@ -2896,26 -2780,26 +2896,26 @@@ xfs_rename_alloc_whiteout
   */
  int
  xfs_rename(
 -      xfs_inode_t     *src_dp,
 -      struct xfs_name *src_name,
 -      xfs_inode_t     *src_ip,
 -      xfs_inode_t     *target_dp,
 -      struct xfs_name *target_name,
 -      xfs_inode_t     *target_ip,
 -      unsigned int    flags)
 +      struct xfs_inode        *src_dp,
 +      struct xfs_name         *src_name,
 +      struct xfs_inode        *src_ip,
 +      struct xfs_inode        *target_dp,
 +      struct xfs_name         *target_name,
 +      struct xfs_inode        *target_ip,
 +      unsigned int            flags)
  {
 -      xfs_trans_t     *tp = NULL;
 -      xfs_mount_t     *mp = src_dp->i_mount;
 -      bool            new_parent;             /* moving to a new dir */
 -      bool            src_is_directory;       /* src_name is a directory */
 -      int             error;
 -      xfs_bmap_free_t free_list;
 -      xfs_fsblock_t   first_block;
 -      int             cancel_flags;
 -      int             committed;
 -      xfs_inode_t     *inodes[4];
 -      int             spaceres;
 -      int             num_inodes;
 +      struct xfs_mount        *mp = src_dp->i_mount;
 +      struct xfs_trans        *tp;
 +      struct xfs_bmap_free    free_list;
 +      xfs_fsblock_t           first_block;
 +      struct xfs_inode        *wip = NULL;            /* whiteout inode */
 +      struct xfs_inode        *inodes[__XFS_SORT_INODES];
 +      int                     num_inodes = __XFS_SORT_INODES;
-       int                     new_parent = (src_dp != target_dp);
-       int                     src_is_directory = S_ISDIR(src_ip->i_d.di_mode);
++      bool                    new_parent = (src_dp != target_dp);
++      bool                    src_is_directory = S_ISDIR(src_ip->i_d.di_mode);
 +      int                     cancel_flags = 0;
 +      int                     spaceres;
 +      int                     error;
  
        trace_xfs_rename(src_dp, target_dp, src_name, target_name);
  

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

diff --cc fs/xfs/xfs_trace.h
Simple merge