diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-10-03 09:56:28 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-10-03 09:56:28 +1100 |
| commit | 155cd433b516506df065866f3d974661f6473572 (patch) | |
| tree | c16fcc875b58c39818377226ba0e5c8e44e6d324 /fs/xfs/xfs_extent_busy.c | |
| parent | a1f45e668e14c26b4700b1936c5a41b58cc4ac74 (diff) | |
| parent | 5cd9cee98b256d94443d93a31efc36212a2bd634 (diff) | |
| download | linux-155cd433b516506df065866f3d974661f6473572.tar.bz2 | |
Merge branch 'xfs-4.9-log-recovery-fixes' into for-next
Diffstat (limited to 'fs/xfs/xfs_extent_busy.c')
| -rw-r--r-- | fs/xfs/xfs_extent_busy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c index c263e079273e..162dc186cf04 100644 --- a/fs/xfs/xfs_extent_busy.c +++ b/fs/xfs/xfs_extent_busy.c @@ -384,7 +384,7 @@ restart: * If this is a metadata allocation, try to reuse the busy * extent instead of trimming the allocation. */ - if (!args->userdata && + if (!xfs_alloc_is_userdata(args->datatype) && !(busyp->flags & XFS_EXTENT_BUSY_DISCARDED)) { if (!xfs_extent_busy_update_extent(args->mp, args->pag, busyp, fbno, flen, |