summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_inode.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-03-25 15:12:30 +1100
committerDave Chinner <david@fromorbit.com>2015-03-25 15:12:30 +1100
commit2b93681f593577df6fcb9af61947beaace071b74 (patch)
tree1d4826b38a06d3da93de1aaf9f66dda2cd99911d /fs/xfs/xfs_inode.c
parentd41bb03444147305e955cdd53753f0493e4d9e28 (diff)
parent5e9383f97e773e9a5385144ef5561f2ac0ee1349 (diff)
downloadlinux-2b93681f593577df6fcb9af61947beaace071b74.tar.bz2
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.c4
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;