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_filestream.c | |
| parent | a1f45e668e14c26b4700b1936c5a41b58cc4ac74 (diff) | |
| parent | 5cd9cee98b256d94443d93a31efc36212a2bd634 (diff) | |
| download | talos-obmc-linux-155cd433b516506df065866f3d974661f6473572.tar.gz talos-obmc-linux-155cd433b516506df065866f3d974661f6473572.zip | |
Merge branch 'xfs-4.9-log-recovery-fixes' into for-next
Diffstat (limited to 'fs/xfs/xfs_filestream.c')
| -rw-r--r-- | fs/xfs/xfs_filestream.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c index c8005fdaaa8a..043ca3808ea2 100644 --- a/fs/xfs/xfs_filestream.c +++ b/fs/xfs/xfs_filestream.c @@ -371,7 +371,8 @@ xfs_filestream_new_ag( struct xfs_mount *mp = ip->i_mount; xfs_extlen_t minlen = ap->length; xfs_agnumber_t startag = 0; - int flags, err = 0; + int flags = 0; + int err = 0; struct xfs_mru_cache_elem *mru; *agp = NULLAGNUMBER; @@ -387,8 +388,10 @@ xfs_filestream_new_ag( startag = (item->ag + 1) % mp->m_sb.sb_agcount; } - flags = (ap->userdata ? XFS_PICK_USERDATA : 0) | - (ap->dfops->dop_low ? XFS_PICK_LOWSPACE : 0); + if (xfs_alloc_is_userdata(ap->datatype)) + flags |= XFS_PICK_USERDATA; + if (ap->dfops->dop_low) + flags |= XFS_PICK_LOWSPACE; err = xfs_filestream_pick_ag(pip, startag, agp, flags, minlen); |
