diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-05-20 00:34:00 (GMT) |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-05-20 00:34:00 (GMT) |
| commit | 555b67e4e729ca544bb4028ab12e532c68b70ddb (patch) | |
| tree | 8bfb59ccca39cebe0210366bebfeddd8bd3ab3a3 /fs/xfs/libxfs | |
| parent | 544ad71fc8e20fb3a6f50f00d487751492cd8409 (diff) | |
| parent | ad438c4038968e5ca5248f851212634e474983e8 (diff) | |
| download | linux-555b67e4e729ca544bb4028ab12e532c68b70ddb.tar.xz | |
Merge branch 'xfs-4.7-inode-reclaim' into for-next
Diffstat (limited to 'fs/xfs/libxfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_inode_fork.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c index d3d1477..bbcc8c7 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.c +++ b/fs/xfs/libxfs/xfs_inode_fork.c @@ -1519,6 +1519,24 @@ xfs_iext_indirect_to_direct( } /* + * Remove all records from the indirection array. + */ +STATIC void +xfs_iext_irec_remove_all( + struct xfs_ifork *ifp) +{ + int nlists; + int i; + + ASSERT(ifp->if_flags & XFS_IFEXTIREC); + nlists = ifp->if_real_bytes / XFS_IEXT_BUFSZ; + for (i = 0; i < nlists; i++) + kmem_free(ifp->if_u1.if_ext_irec[i].er_extbuf); + kmem_free(ifp->if_u1.if_ext_irec); + ifp->if_flags &= ~XFS_IFEXTIREC; +} + +/* * Free incore file extents. */ void @@ -1526,14 +1544,7 @@ xfs_iext_destroy( xfs_ifork_t *ifp) /* inode fork pointer */ { if (ifp->if_flags & XFS_IFEXTIREC) { - int erp_idx; - int nlists; - - nlists = ifp->if_real_bytes / XFS_IEXT_BUFSZ; - for (erp_idx = nlists - 1; erp_idx >= 0 ; erp_idx--) { - xfs_iext_irec_remove(ifp, erp_idx); - } - ifp->if_flags &= ~XFS_IFEXTIREC; + xfs_iext_irec_remove_all(ifp); } else if (ifp->if_real_bytes) { kmem_free(ifp->if_u1.if_extents); } else if (ifp->if_bytes) { |