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

Merge branch 'xfs-feature-bit-cleanup' into for-next

Browse Source 
Conflicts:
	fs/xfs/xfs_inode.c
This commit is contained in:
Dave Chinner
2014-05-20 08:57:02 +10:00
parent 0d907a3bb4 ab3e57b53f
commit b70f14e1ff
11 changed files with 101 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/xfs/xfs_ioctl.c
View File

@@ -1228,15 +1228,8 @@ xfs_ioctl_setattr(
olddquot = xfs_qm_vop_chown(tp, ip,
&ip->i_pdquot, pdqp);
}
ASSERT(ip->i_d.di_version > 1);
xfs_set_projid(ip, fa->fsx_projid);
/*
* We may have to rev the inode as well as
* the superblock version number since projids didn't
* exist before DINODE_VERSION_2 and SB_VERSION_NLINK.
*/
if (ip->i_d.di_version == 1)
xfs_bump_ino_vers2(tp, ip);
}
}