diff options
| author |   Dave Chinner <david@fromorbit.com> | 2015-03-25 15:12:30 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-03-25 15:12:30 +1100 |
| commit | 2b93681f593577df6fcb9af61947beaace071b74 (patch) | |
| tree | 1d4826b38a06d3da93de1aaf9f66dda2cd99911d /fs/xfs/xfs_inode.c | |
| parent | Merge branch 'xfs-rename-whiteout' into for-next (diff) | |
| parent | xfs: Fix incorrect positive ENOMEM return (diff) | |
| download | linux-dev-2b93681f593577df6fcb9af61947beaace071b74.tar.xz linux-dev-2b93681f593577df6fcb9af61947beaace071b74.zip | |
Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next
Conflicts:
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/xfs_inode.c
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 8394f6f17120..d6ebc85192b7 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2911,8 +2911,8 @@ xfs_rename( 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; |