xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	fs/xfs/libxfs/xfs_bmap.c
	fs/xfs/xfs_inode.c
This commit is contained in:
Dave Chinner
2015-03-25 15:12:30 +11:00
parent d41bb03444 5e9383f97e
commit 2b93681f59
8 changed files with 20 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/xfs_inode.c
View File

@@ -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;