diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-06-04 13:31:13 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-06-04 13:31:13 +1000 |
| commit | 4497f28750cd129a669e32b7810dd755102aebbd (patch) | |
| tree | 0e16a0ee8fc52793614dbf45e4c4ff051925bd47 /fs/xfs/xfs_inode.c | |
| parent | 66e8ac7bfa0a591b8cfaa447db2daa5b6e9221d0 (diff) | |
| parent | 46fc58dacf6e9b00629c57998a8a23f85c262b3f (diff) | |
| download | op-kernel-dev-4497f28750cd129a669e32b7810dd755102aebbd.zip op-kernel-dev-4497f28750cd129a669e32b7810dd755102aebbd.tar.gz | |
Merge branch 'xfs-misc-fixes-for-4.2-2' into for-next
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 4c054f6..17cd90c 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -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; } |
