[05/42] xfs: t_firstblock is tracking AGs not blocks

Message ID	20230118224505.1964941-6-david@fromorbit.com (mailing list archive)
State	Superseded, archived
Headers	show Return-Path: <linux-xfs-owner@vger.kernel.org> From: Dave Chinner <david@fromorbit.com> To: linux-xfs@vger.kernel.org Subject: [PATCH 05/42] xfs: t_firstblock is tracking AGs not blocks Date: Thu, 19 Jan 2023 09:44:28 +1100 Message-Id: <20230118224505.1964941-6-david@fromorbit.com> In-Reply-To: <20230118224505.1964941-1-david@fromorbit.com> References: <20230118224505.1964941-1-david@fromorbit.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	xfs: per-ag centric allocation alogrithms \| expand [00/42] xfs: per-ag centric allocation alogrithms [01/42] xfs: fix low space alloc deadlock [02/42] xfs: prefer free inodes at ENOSPC over chunk allocation [03/42] xfs: block reservation too large for minleft allocation [04/42] xfs: drop firstblock constraints from allocation setup [05/42] xfs: t_firstblock is tracking AGs not blocks [06/42] xfs: don't assert fail on transaction cancel with deferred ops [07/42] xfs: active perag reference counting [08/42] xfs: rework the perag trace points to be perag centric [09/42] xfs: convert xfs_imap() to take a perag [10/42] xfs: use active perag references for inode allocation [11/42] xfs: inobt can use perags in many more places than it does [12/42] xfs: convert xfs_ialloc_next_ag() to an atomic [13/42] xfs: perags need atomic operational state [14/42] xfs: introduce xfs_for_each_perag_wrap() [15/42] xfs: rework xfs_alloc_vextent() [16/42] xfs: factor xfs_alloc_vextent_this_ag() for _iterate_ags() [17/42] xfs: combine __xfs_alloc_vextent_this_ag and xfs_alloc_ag_vextent [18/42] xfs: use xfs_alloc_vextent_this_ag() where appropriate [19/42] xfs: factor xfs_bmap_btalloc() [20/42] xfs: use xfs_alloc_vextent_first_ag() where appropriate [21/42] xfs: use xfs_alloc_vextent_start_bno() where appropriate [22/42] xfs: introduce xfs_alloc_vextent_near_bno() [23/42] xfs: introduce xfs_alloc_vextent_exact_bno() [24/42] xfs: introduce xfs_alloc_vextent_prepare() [25/42] xfs: move allocation accounting to xfs_alloc_vextent_set_fsbno() [26/42] xfs: fold xfs_alloc_ag_vextent() into callers [27/42] xfs: move the minimum agno checks into xfs_alloc_vextent_check_args [28/42] xfs: convert xfs_alloc_vextent_iterate_ags() to use perag walker [29/42] xfs: convert trim to use for_each_perag_range [30/42] xfs: factor out filestreams from xfs_bmap_btalloc_nullfb [31/42] xfs: get rid of notinit from xfs_bmap_longest_free_extent [32/42] xfs: use xfs_bmap_longest_free_extent() in filestreams [33/42] xfs: move xfs_bmap_btalloc_filestreams() to xfs_filestreams.c [34/42] xfs: merge filestream AG lookup into xfs_filestream_select_ag() [35/42] xfs: merge new filestream AG selection into xfs_filestream_select_ag() [36/42] xfs: remove xfs_filestream_select_ag() longest extent check [37/42] xfs: factor out MRU hit case in xfs_filestream_select_ag [38/42] xfs: track an active perag reference in filestreams [39/42] xfs: use for_each_perag_wrap in xfs_filestream_pick_ag [40/42] xfs: pass perag to filestreams tracing [41/42] xfs: return a referenced perag from filestreams allocator [42/42] xfs: refactor the filestreams allocator pick functions

Message ID

20230118224505.1964941-6-david@fromorbit.com (mailing list archive)

State

Superseded, archived

Headers

From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 05/42] xfs: t_firstblock is tracking AGs not blocks
Date: Thu, 19 Jan 2023 09:44:28 +1100
Message-Id: <20230118224505.1964941-6-david@fromorbit.com>
In-Reply-To: <20230118224505.1964941-1-david@fromorbit.com>
References: <20230118224505.1964941-1-david@fromorbit.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

xfs: per-ag centric allocation alogrithms | expand

Commit Message

Dave Chinner Jan. 18, 2023, 10:44 p.m. UTC

From: Dave Chinner <dchinner@redhat.com>

The tp->t_firstblock field is now raelly tracking the highest AG we
have locked, not the block number of the highest allocation we've
made. It's purpose is to prevent AGF locking deadlocks, so rename it
to "highest AG" and simplify the implementation to just track the
agno rather than a fsbno.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 fs/xfs/libxfs/xfs_alloc.c      | 12 +++++-------
 fs/xfs/libxfs/xfs_bmap.c       |  4 ++--
 fs/xfs/libxfs/xfs_bmap_btree.c |  6 +++---
 fs/xfs/xfs_bmap_util.c         |  2 +-
 fs/xfs/xfs_inode.c             |  2 +-
 fs/xfs/xfs_reflink.c           |  2 +-
 fs/xfs/xfs_trace.h             |  8 ++++----
 fs/xfs/xfs_trans.c             |  4 ++--
 fs/xfs/xfs_trans.h             |  2 +-
 9 files changed, 20 insertions(+), 22 deletions(-)

Comments

Allison Henderson Jan. 19, 2023, 10:12 p.m. UTC | #1

On Thu, 2023-01-19 at 09:44 +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> The tp->t_firstblock field is now raelly tracking the highest AG we
> have locked, not the block number of the highest allocation we've
> made. It's purpose is to prevent AGF locking deadlocks, so rename it
> to "highest AG" and simplify the implementation to just track the
> agno rather than a fsbno.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Looks a like a straight forward rename
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>

> ---
>  fs/xfs/libxfs/xfs_alloc.c      | 12 +++++-------
>  fs/xfs/libxfs/xfs_bmap.c       |  4 ++--
>  fs/xfs/libxfs/xfs_bmap_btree.c |  6 +++---
>  fs/xfs/xfs_bmap_util.c         |  2 +-
>  fs/xfs/xfs_inode.c             |  2 +-
>  fs/xfs/xfs_reflink.c           |  2 +-
>  fs/xfs/xfs_trace.h             |  8 ++++----
>  fs/xfs/xfs_trans.c             |  4 ++--
>  fs/xfs/xfs_trans.h             |  2 +-
>  9 files changed, 20 insertions(+), 22 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index c2f38f595d7f..9f26a9368eeb 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -3169,8 +3169,8 @@ xfs_alloc_vextent(
>         mp = args->mp;
>         type = args->otype = args->type;
>         args->agbno = NULLAGBLOCK;
> -       if (args->tp->t_firstblock != NULLFSBLOCK)
> -               minimum_agno = XFS_FSB_TO_AGNO(mp, args->tp-
> >t_firstblock);
> +       if (args->tp->t_highest_agno != NULLAGNUMBER)
> +               minimum_agno = args->tp->t_highest_agno;
>         /*
>          * Just fix this up, for the case where the last a.g. is
> shorter
>          * (or there's only one a.g.) and the caller couldn't easily
> figure
> @@ -3375,11 +3375,9 @@ xfs_alloc_vextent(
>          * deadlocks.
>          */
>         if (args->agbp &&
> -           (args->tp->t_firstblock == NULLFSBLOCK ||
> -            args->pag->pag_agno > minimum_agno)) {
> -               args->tp->t_firstblock = XFS_AGB_TO_FSB(mp,
> -                                       args->pag->pag_agno, 0);
> -       }
> +           (args->tp->t_highest_agno == NULLAGNUMBER ||
> +            args->pag->pag_agno > minimum_agno))
> +               args->tp->t_highest_agno = args->pag->pag_agno;
>         xfs_perag_put(args->pag);
>         return 0;
>  error0:
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index bc566aae4246..f15d45af661f 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -4192,7 +4192,7 @@ xfs_bmapi_minleft(
>  {
>         struct xfs_ifork        *ifp = xfs_ifork_ptr(ip, fork);
>  
> -       if (tp && tp->t_firstblock != NULLFSBLOCK)
> +       if (tp && tp->t_highest_agno != NULLAGNUMBER)
>                 return 0;
>         if (ifp->if_format != XFS_DINODE_FMT_BTREE)
>                 return 1;
> @@ -6084,7 +6084,7 @@ xfs_bmap_finish_one(
>  {
>         int                             error = 0;
>  
> -       ASSERT(tp->t_firstblock == NULLFSBLOCK);
> +       ASSERT(tp->t_highest_agno == NULLAGNUMBER);
>  
>         trace_xfs_bmap_deferred(tp->t_mountp,
>                         XFS_FSB_TO_AGNO(tp->t_mountp, startblock),
> type,
> diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c
> b/fs/xfs/libxfs/xfs_bmap_btree.c
> index 76a0f0d260a4..afd9b2d962a3 100644
> --- a/fs/xfs/libxfs/xfs_bmap_btree.c
> +++ b/fs/xfs/libxfs/xfs_bmap_btree.c
> @@ -184,11 +184,11 @@ xfs_bmbt_update_cursor(
>         struct xfs_btree_cur    *src,
>         struct xfs_btree_cur    *dst)
>  {
> -       ASSERT((dst->bc_tp->t_firstblock != NULLFSBLOCK) ||
> +       ASSERT((dst->bc_tp->t_highest_agno != NULLAGNUMBER) ||
>                (dst->bc_ino.ip->i_diflags & XFS_DIFLAG_REALTIME));
>  
>         dst->bc_ino.allocated += src->bc_ino.allocated;
> -       dst->bc_tp->t_firstblock = src->bc_tp->t_firstblock;
> +       dst->bc_tp->t_highest_agno = src->bc_tp->t_highest_agno;
>  
>         src->bc_ino.allocated = 0;
>  }
> @@ -218,7 +218,7 @@ xfs_bmbt_alloc_block(
>          * we have to ensure that we attempt to locate the entire set
> of bmbt
>          * allocations in the same AG, as xfs_bmapi_write() would
> have reserved.
>          */
> -       if (cur->bc_tp->t_firstblock == NULLFSBLOCK)
> +       if (cur->bc_tp->t_highest_agno == NULLAGNUMBER)
>                 args.minleft = xfs_bmapi_minleft(cur->bc_tp, cur-
> >bc_ino.ip,
>                                         cur->bc_ino.whichfork);
>  
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index 867645b74d88..a09dd2606479 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -1410,7 +1410,7 @@ xfs_swap_extent_rmap(
>  
>                 /* Unmap the old blocks in the source file. */
>                 while (tirec.br_blockcount) {
> -                       ASSERT(tp->t_firstblock == NULLFSBLOCK);
> +                       ASSERT(tp->t_highest_agno == NULLAGNUMBER);
>                         trace_xfs_swap_extent_rmap_remap_piece(tip,
> &tirec);
>  
>                         /* Read extent from the source file */
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index d354ea2b74f9..dbe274b8065d 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -1367,7 +1367,7 @@ xfs_itruncate_extents_flags(
>  
>         unmap_len = XFS_MAX_FILEOFF - first_unmap_block + 1;
>         while (unmap_len > 0) {
> -               ASSERT(tp->t_firstblock == NULLFSBLOCK);
> +               ASSERT(tp->t_highest_agno == NULLAGNUMBER);
>                 error = __xfs_bunmapi(tp, ip, first_unmap_block,
> &unmap_len,
>                                 flags, XFS_ITRUNC_MAX_EXTENTS);
>                 if (error)
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index 5535778a98f9..57bf59ff4854 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -610,7 +610,7 @@ xfs_reflink_cancel_cow_blocks(
>                         if (error)
>                                 break;
>                 } else if (del.br_state == XFS_EXT_UNWRITTEN ||
> cancel_real) {
> -                       ASSERT((*tpp)->t_firstblock == NULLFSBLOCK);
> +                       ASSERT((*tpp)->t_highest_agno ==
> NULLAGNUMBER);
>  
>                         /* Free the CoW orphan record. */
>                         xfs_refcount_free_cow_extent(*tpp,
> del.br_startblock,
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 918e778fdd55..7dc57db6aa42 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -1801,7 +1801,7 @@ DECLARE_EVENT_CLASS(xfs_alloc_class,
>                 __field(char, wasfromfl)
>                 __field(int, resv)
>                 __field(int, datatype)
> -               __field(xfs_fsblock_t, firstblock)
> +               __field(xfs_agnumber_t, highest_agno)
>         ),
>         TP_fast_assign(
>                 __entry->dev = args->mp->m_super->s_dev;
> @@ -1822,12 +1822,12 @@ DECLARE_EVENT_CLASS(xfs_alloc_class,
>                 __entry->wasfromfl = args->wasfromfl;
>                 __entry->resv = args->resv;
>                 __entry->datatype = args->datatype;
> -               __entry->firstblock = args->tp->t_firstblock;
> +               __entry->highest_agno = args->tp->t_highest_agno;
>         ),
>         TP_printk("dev %d:%d agno 0x%x agbno 0x%x minlen %u maxlen %u
> mod %u "
>                   "prod %u minleft %u total %u alignment %u
> minalignslop %u "
>                   "len %u type %s otype %s wasdel %d wasfromfl %d
> resv %d "
> -                 "datatype 0x%x firstblock 0x%llx",
> +                 "datatype 0x%x highest_agno 0x%x",
>                   MAJOR(__entry->dev), MINOR(__entry->dev),
>                   __entry->agno,
>                   __entry->agbno,
> @@ -1846,7 +1846,7 @@ DECLARE_EVENT_CLASS(xfs_alloc_class,
>                   __entry->wasfromfl,
>                   __entry->resv,
>                   __entry->datatype,
> -                 (unsigned long long)__entry->firstblock)
> +                 __entry->highest_agno)
>  )
>  
>  #define DEFINE_ALLOC_EVENT(name) \
> diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
> index 7bd16fbff534..53ab544e4c2c 100644
> --- a/fs/xfs/xfs_trans.c
> +++ b/fs/xfs/xfs_trans.c
> @@ -102,7 +102,7 @@ xfs_trans_dup(
>         INIT_LIST_HEAD(&ntp->t_items);
>         INIT_LIST_HEAD(&ntp->t_busy);
>         INIT_LIST_HEAD(&ntp->t_dfops);
> -       ntp->t_firstblock = NULLFSBLOCK;
> +       ntp->t_highest_agno = NULLAGNUMBER;
>  
>         ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);
>         ASSERT(tp->t_ticket != NULL);
> @@ -278,7 +278,7 @@ xfs_trans_alloc(
>         INIT_LIST_HEAD(&tp->t_items);
>         INIT_LIST_HEAD(&tp->t_busy);
>         INIT_LIST_HEAD(&tp->t_dfops);
> -       tp->t_firstblock = NULLFSBLOCK;
> +       tp->t_highest_agno = NULLAGNUMBER;
>  
>         error = xfs_trans_reserve(tp, resp, blocks, rtextents);
>         if (error == -ENOSPC && want_retry) {
> diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
> index 55819785941c..6e3646d524ce 100644
> --- a/fs/xfs/xfs_trans.h
> +++ b/fs/xfs/xfs_trans.h
> @@ -132,7 +132,7 @@ typedef struct xfs_trans {
>         unsigned int            t_rtx_res;      /* # of rt extents
> resvd */
>         unsigned int            t_rtx_res_used; /* # of resvd rt
> extents used */
>         unsigned int            t_flags;        /* misc flags */
> -       xfs_fsblock_t           t_firstblock;   /* first block
> allocated */
> +       xfs_agnumber_t          t_highest_agno; /* highest AGF locked
> */
>         struct xlog_ticket      *t_ticket;      /* log mgr ticket */
>         struct xfs_mount        *t_mountp;      /* ptr to fs mount
> struct */
>         struct xfs_dquot_acct   *t_dqinfo;      /* acctg info for
> dquots */

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index c2f38f595d7f..9f26a9368eeb 100644
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -3169,8 +3169,8 @@  xfs_alloc_vextent(
 	mp = args->mp;
 	type = args->otype = args->type;
 	args->agbno = NULLAGBLOCK;
-	if (args->tp->t_firstblock != NULLFSBLOCK)
-		minimum_agno = XFS_FSB_TO_AGNO(mp, args->tp->t_firstblock);
+	if (args->tp->t_highest_agno != NULLAGNUMBER)
+		minimum_agno = args->tp->t_highest_agno;
 	/*
 	 * Just fix this up, for the case where the last a.g. is shorter
 	 * (or there's only one a.g.) and the caller couldn't easily figure
@@ -3375,11 +3375,9 @@  xfs_alloc_vextent(
 	 * deadlocks.
 	 */
 	if (args->agbp &&
-	    (args->tp->t_firstblock == NULLFSBLOCK ||
-	     args->pag->pag_agno > minimum_agno)) {
-		args->tp->t_firstblock = XFS_AGB_TO_FSB(mp,
-					args->pag->pag_agno, 0);
-	}
+	    (args->tp->t_highest_agno == NULLAGNUMBER ||
+	     args->pag->pag_agno > minimum_agno))
+		args->tp->t_highest_agno = args->pag->pag_agno;
 	xfs_perag_put(args->pag);
 	return 0;
 error0:
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index bc566aae4246..f15d45af661f 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -4192,7 +4192,7 @@  xfs_bmapi_minleft(
 {
 	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, fork);
 
-	if (tp && tp->t_firstblock != NULLFSBLOCK)
+	if (tp && tp->t_highest_agno != NULLAGNUMBER)
 		return 0;
 	if (ifp->if_format != XFS_DINODE_FMT_BTREE)
 		return 1;
@@ -6084,7 +6084,7 @@  xfs_bmap_finish_one(
 {
 	int				error = 0;
 
-	ASSERT(tp->t_firstblock == NULLFSBLOCK);
+	ASSERT(tp->t_highest_agno == NULLAGNUMBER);
 
 	trace_xfs_bmap_deferred(tp->t_mountp,
 			XFS_FSB_TO_AGNO(tp->t_mountp, startblock), type,
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
index 76a0f0d260a4..afd9b2d962a3 100644
--- a/fs/xfs/libxfs/xfs_bmap_btree.c
+++ b/fs/xfs/libxfs/xfs_bmap_btree.c
@@ -184,11 +184,11 @@  xfs_bmbt_update_cursor(
 	struct xfs_btree_cur	*src,
 	struct xfs_btree_cur	*dst)
 {
-	ASSERT((dst->bc_tp->t_firstblock != NULLFSBLOCK) ||
+	ASSERT((dst->bc_tp->t_highest_agno != NULLAGNUMBER) ||
 	       (dst->bc_ino.ip->i_diflags & XFS_DIFLAG_REALTIME));
 
 	dst->bc_ino.allocated += src->bc_ino.allocated;
-	dst->bc_tp->t_firstblock = src->bc_tp->t_firstblock;
+	dst->bc_tp->t_highest_agno = src->bc_tp->t_highest_agno;
 
 	src->bc_ino.allocated = 0;
 }
@@ -218,7 +218,7 @@  xfs_bmbt_alloc_block(
 	 * we have to ensure that we attempt to locate the entire set of bmbt
 	 * allocations in the same AG, as xfs_bmapi_write() would have reserved.
 	 */
-	if (cur->bc_tp->t_firstblock == NULLFSBLOCK)
+	if (cur->bc_tp->t_highest_agno == NULLAGNUMBER)
 		args.minleft = xfs_bmapi_minleft(cur->bc_tp, cur->bc_ino.ip,
 					cur->bc_ino.whichfork);
 
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 867645b74d88..a09dd2606479 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1410,7 +1410,7 @@  xfs_swap_extent_rmap(
 
 		/* Unmap the old blocks in the source file. */
 		while (tirec.br_blockcount) {
-			ASSERT(tp->t_firstblock == NULLFSBLOCK);
+			ASSERT(tp->t_highest_agno == NULLAGNUMBER);
 			trace_xfs_swap_extent_rmap_remap_piece(tip, &tirec);
 
 			/* Read extent from the source file */
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index d354ea2b74f9..dbe274b8065d 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1367,7 +1367,7 @@  xfs_itruncate_extents_flags(
 
 	unmap_len = XFS_MAX_FILEOFF - first_unmap_block + 1;
 	while (unmap_len > 0) {
-		ASSERT(tp->t_firstblock == NULLFSBLOCK);
+		ASSERT(tp->t_highest_agno == NULLAGNUMBER);
 		error = __xfs_bunmapi(tp, ip, first_unmap_block, &unmap_len,
 				flags, XFS_ITRUNC_MAX_EXTENTS);
 		if (error)
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 5535778a98f9..57bf59ff4854 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -610,7 +610,7 @@  xfs_reflink_cancel_cow_blocks(
 			if (error)
 				break;
 		} else if (del.br_state == XFS_EXT_UNWRITTEN || cancel_real) {
-			ASSERT((*tpp)->t_firstblock == NULLFSBLOCK);
+			ASSERT((*tpp)->t_highest_agno == NULLAGNUMBER);
 
 			/* Free the CoW orphan record. */
 			xfs_refcount_free_cow_extent(*tpp, del.br_startblock,
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 918e778fdd55..7dc57db6aa42 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -1801,7 +1801,7 @@  DECLARE_EVENT_CLASS(xfs_alloc_class,
 		__field(char, wasfromfl)
 		__field(int, resv)
 		__field(int, datatype)
-		__field(xfs_fsblock_t, firstblock)
+		__field(xfs_agnumber_t, highest_agno)
 	),
 	TP_fast_assign(
 		__entry->dev = args->mp->m_super->s_dev;
@@ -1822,12 +1822,12 @@  DECLARE_EVENT_CLASS(xfs_alloc_class,
 		__entry->wasfromfl = args->wasfromfl;
 		__entry->resv = args->resv;
 		__entry->datatype = args->datatype;
-		__entry->firstblock = args->tp->t_firstblock;
+		__entry->highest_agno = args->tp->t_highest_agno;
 	),
 	TP_printk("dev %d:%d agno 0x%x agbno 0x%x minlen %u maxlen %u mod %u "
 		  "prod %u minleft %u total %u alignment %u minalignslop %u "
 		  "len %u type %s otype %s wasdel %d wasfromfl %d resv %d "
-		  "datatype 0x%x firstblock 0x%llx",
+		  "datatype 0x%x highest_agno 0x%x",
 		  MAJOR(__entry->dev), MINOR(__entry->dev),
 		  __entry->agno,
 		  __entry->agbno,
@@ -1846,7 +1846,7 @@  DECLARE_EVENT_CLASS(xfs_alloc_class,
 		  __entry->wasfromfl,
 		  __entry->resv,
 		  __entry->datatype,
-		  (unsigned long long)__entry->firstblock)
+		  __entry->highest_agno)
 )
 
 #define DEFINE_ALLOC_EVENT(name) \
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 7bd16fbff534..53ab544e4c2c 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -102,7 +102,7 @@  xfs_trans_dup(
 	INIT_LIST_HEAD(&ntp->t_items);
 	INIT_LIST_HEAD(&ntp->t_busy);
 	INIT_LIST_HEAD(&ntp->t_dfops);
-	ntp->t_firstblock = NULLFSBLOCK;
+	ntp->t_highest_agno = NULLAGNUMBER;
 
 	ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);
 	ASSERT(tp->t_ticket != NULL);
@@ -278,7 +278,7 @@  xfs_trans_alloc(
 	INIT_LIST_HEAD(&tp->t_items);
 	INIT_LIST_HEAD(&tp->t_busy);
 	INIT_LIST_HEAD(&tp->t_dfops);
-	tp->t_firstblock = NULLFSBLOCK;
+	tp->t_highest_agno = NULLAGNUMBER;
 
 	error = xfs_trans_reserve(tp, resp, blocks, rtextents);
 	if (error == -ENOSPC && want_retry) {
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index 55819785941c..6e3646d524ce 100644
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -132,7 +132,7 @@  typedef struct xfs_trans {
 	unsigned int		t_rtx_res;	/* # of rt extents resvd */
 	unsigned int		t_rtx_res_used;	/* # of resvd rt extents used */
 	unsigned int		t_flags;	/* misc flags */
-	xfs_fsblock_t		t_firstblock;	/* first block allocated */
+	xfs_agnumber_t		t_highest_agno;	/* highest AGF locked */
 	struct xlog_ticket	*t_ticket;	/* log mgr ticket */
 	struct xfs_mount	*t_mountp;	/* ptr to fs mount struct */
 	struct xfs_dquot_acct   *t_dqinfo;	/* acctg info for dquots */

[05/42] xfs: t_firstblock is tracking AGs not blocks

Commit Message

Comments

Patch