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.2-2' into for-next

Browse Source
This commit is contained in:
Dave Chinner
2015-06-04 13:31:13 +10:00
parent 66e8ac7bfa 46fc58dacf
commit 4497f28750
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/xfs/xfs_inode.c
View File

@@ -2244,6 +2244,7 @@ xfs_ifree_cluster(
int inodes_per_cluster;
int nbufs;
int i, j;
int ioffset;
xfs_daddr_t blkno;
xfs_buf_t *bp;
xfs_inode_t *ip;
@@ -2264,9 +2265,9 @@ xfs_ifree_cluster(
* physically allocated. Skip the cluster if an inode falls into
* a sparse region.
*/
if ((xic->alloc & XFS_INOBT_MASK(inum - xic->first_ino)) == 0) {
ASSERT(((inum - xic->first_ino) %
inodes_per_cluster) == 0);
ioffset = inum - xic->first_ino;
if ((xic->alloc & XFS_INOBT_MASK(ioffset)) == 0) {
ASSERT(do_mod(ioffset, inodes_per_cluster) == 0);
continue;
}