[PATCH v2 05/23] xfs: add a XFS_INODE_TO_AGINO helper

[Andrey Albershteyn <aalbersh@kernel.org>]

From: Christoph Hellwig <hch@lst.de>

Source kernel commit: f46edc9f1310d27710e2b39bf561ecef51f879d2

Add a shortcut for the common XFS_INO_TO_AGINO(mp, ip->i_ino) pattern.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
 db/iunlink.c            | 2 +-
 libxfs/iunlink.c        | 2 +-
 libxfs/xfs_format.h     | 2 ++
 libxfs/xfs_inode_util.c | 5 ++---
 repair/pptr.c           | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/db/iunlink.c b/db/iunlink.c
index 20946c967f54..7eeef5f0886e 100644
--- a/db/iunlink.c
+++ b/db/iunlink.c
@@ -23,7 +23,7 @@ count_rtblocks(
 		dbprintf(
 _("could not read AG %u agino %u extents, err=%d\n"),
 				XFS_INODE_TO_AGNO(ip),
-				XFS_INO_TO_AGINO(ip->i_mount, ip->i_ino),
+				XFS_INODE_TO_AGINO(ip),
 				error);
 		return 0;
 	}
diff --git a/libxfs/iunlink.c b/libxfs/iunlink.c
index 2d4dd0aee0b8..7a00915290db 100644
--- a/libxfs/iunlink.c
+++ b/libxfs/iunlink.c
@@ -66,7 +66,7 @@ xfs_iunlink_log_dinode(
 	}
 
 	trace_xfs_iunlink_update_dinode(mp, pag_agno(iup->pag),
-					XFS_INO_TO_AGINO(mp, ip->i_ino),
+					XFS_INODE_TO_AGINO(ip),
 					be32_to_cpu(dip->di_next_unlinked),
 					iup->next_agino);
 
diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index 36a00c174f1e..f812c6782492 100644
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -1280,6 +1280,8 @@ static inline bool xfs_dinode_is_metadir(const struct xfs_dinode *dip)
 	XFS_INO_TO_AGNO((ip)->i_mount, (ip)->i_ino)
 #define	XFS_INO_TO_AGINO(mp,i)		\
 	((xfs_agino_t)(i) & XFS_INO_MASK(XFS_INO_AGINO_BITS(mp)))
+#define	XFS_INODE_TO_AGINO(ip)		\
+	XFS_INO_TO_AGINO((ip)->i_mount, (ip)->i_ino)
 #define	XFS_INO_TO_AGBNO(mp,i)		\
 	(((xfs_agblock_t)(i) >> XFS_INO_OFFSET_BITS(mp)) & \
 		XFS_INO_MASK(XFS_INO_AGBNO_BITS(mp)))
diff --git a/libxfs/xfs_inode_util.c b/libxfs/xfs_inode_util.c
index 8e439dc2f4fa..63b95238d8ce 100644
--- a/libxfs/xfs_inode_util.c
+++ b/libxfs/xfs_inode_util.c
@@ -461,10 +461,9 @@ xfs_iunlink_insert_inode(
 	struct xfs_buf		*agibp,
 	struct xfs_inode	*ip)
 {
-	struct xfs_mount	*mp = tp->t_mountp;
 	struct xfs_agi		*agi = agibp->b_addr;
 	xfs_agino_t		next_agino;
-	xfs_agino_t		agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
+	xfs_agino_t		agino = XFS_INODE_TO_AGINO(ip);
 	short			bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
 	int			error;
 
@@ -550,7 +549,7 @@ xfs_iunlink_remove_inode(
 {
 	struct xfs_mount	*mp = tp->t_mountp;
 	struct xfs_agi		*agi = agibp->b_addr;
-	xfs_agino_t		agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
+	xfs_agino_t		agino = XFS_INODE_TO_AGINO(ip);
 	xfs_agino_t		head_agino;
 	short			bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
 	int			error;
diff --git a/repair/pptr.c b/repair/pptr.c
index dc1ea2288eac..39e7bb5030d0 100644
--- a/repair/pptr.c
+++ b/repair/pptr.c
@@ -1051,7 +1051,7 @@ crosscheck_file_parent_ptrs(
 	struct file_pptr	*file_pptr;
 	struct xfs_mount	*mp = ip->i_mount;
 	xfs_agnumber_t		agno = XFS_INODE_TO_AGNO(ip);
-	xfs_agino_t		agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
+	xfs_agino_t		agino = XFS_INODE_TO_AGINO(ip);
 	int			error;
 
 	ag_pptr = peek_slab_cursor(fscan->ag_pptr_recs_cur);
-- 
2.55.0