Merge tag 'trace-v5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux.git] / fs / xfs / xfs_filestream.c

diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index 2d2c5ab9143c2aae73ae37d72f4eb7959ce39cef..574a7a8b4736ba49b297478c0712f16cc8995c42 100644 (file)
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -5,20 +5,19 @@
  * All Rights Reserved.
  */
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_sb.h"
 #include "xfs_mount.h"
-#include "xfs_defer.h"
 #include "xfs_inode.h"
 #include "xfs_bmap.h"
-#include "xfs_bmap_util.h"
 #include "xfs_alloc.h"
 #include "xfs_mru_cache.h"
-#include "xfs_filestream.h"
 #include "xfs_trace.h"
 #include "xfs_ag_resv.h"
+#include "xfs_trans.h"
 
 struct xfs_fstrm_item {
        struct xfs_mru_cache_elem       mru;
@@ -339,7 +338,7 @@ xfs_filestream_lookup_ag(
        if (xfs_filestream_pick_ag(pip, startag, &ag, 0, 0))
                ag = NULLAGNUMBER;
 out:
-       IRELE(pip);
+       xfs_irele(pip);
        return ag;
 }
 
@@ -377,7 +376,7 @@ xfs_filestream_new_ag(
 
        if (xfs_alloc_is_userdata(ap->datatype))
                flags |= XFS_PICK_USERDATA;
-       if (ap->dfops->dop_low)
+       if (ap->tp->t_flags & XFS_TRANS_LOWMODE)
                flags |= XFS_PICK_LOWSPACE;
 
        err = xfs_filestream_pick_ag(pip, startag, agp, flags, minlen);
@@ -388,7 +387,7 @@ xfs_filestream_new_ag(
        if (mru)
                xfs_fstrm_free_func(mp, mru);
 
-       IRELE(pip);
+       xfs_irele(pip);
 exit:
        if (*agp == NULLAGNUMBER)
                *agp = 0;