[PATCH 10/14] xfs: clean up xfs_dqrele_inode calling conventions
From: "Darrick J. Wong" <djwong@kernel.org>
Date: 2021-06-02 00:53:28
Subsystem:
filesystems (vfs and infrastructure), the rest, xfs filesystem · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds, Carlos Maiolino
From: Darrick J. Wong <djwong@kernel.org> Similar to the last patch, establish that xfs_dqrele_inode is responsible for cleaning up anything that xfs_dqrele_inode_grab touches. Signed-off-by: Darrick J. Wong <djwong@kernel.org> --- fs/xfs/xfs_icache.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 5922010b956d..7d956c842ae1 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c@@ -794,7 +794,7 @@ xfs_dqrele_igrab( } /* Drop this inode's dquots. */ -static int +static void xfs_dqrele_inode( struct xfs_inode *ip, void *priv)
@@ -818,7 +818,7 @@ xfs_dqrele_inode( ip->i_pdquot = NULL; } xfs_iunlock(ip, XFS_ILOCK_EXCL); - return 0; + xfs_irele(ip); } /*
@@ -846,7 +846,7 @@ xfs_dqrele_all_inodes( } #else # define xfs_dqrele_igrab(ip) (false) -# define xfs_dqrele_inode(ip, priv) (0) +# define xfs_dqrele_inode(ip, priv) ((void)0) #endif /* CONFIG_XFS_QUOTA */ /*
@@ -1778,8 +1778,7 @@ xfs_inode_walk_ag( continue; switch (goal) { case XFS_ICWALK_DQRELE: - error = xfs_dqrele_inode(batch[i], args); - xfs_irele(batch[i]); + xfs_dqrele_inode(batch[i], args); break; case XFS_ICWALK_BLOCKGC: error = xfs_blockgc_scan_inode(batch[i], args);