xfs: clean up IRELE/iput callsites

Replace the IRELE macro with a proper function so that we can do proper
typechecking and so that we can stop open-coding iput in scrub, which
means that we'll be able to ftrace inode lifetimes going through scrub
correctly.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>

diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
index baac083..346b02a 100644 (file)
--- a/fs/xfs/scrub/common.c
+++ b/fs/xfs/scrub/common.c
@@ -711,7 +711,7 @@ xchk_get_inode(
                return error;
        }
        if (VFS_I(ip)->i_generation != sc->sm->sm_gen) {
-               iput(VFS_I(ip));
+               xfs_irele(ip);
                return -ENOENT;
        }
 

diff --git a/fs/xfs/scrub/dir.c b/fs/xfs/scrub/dir.c
index f587090..cd3e4d7 100644 (file)
--- a/fs/xfs/scrub/dir.c
+++ b/fs/xfs/scrub/dir.c
@@ -87,7 +87,7 @@ xchk_dir_check_ftype(
                        xfs_mode_to_ftype(VFS_I(ip)->i_mode));
        if (ino_dtype != dtype)
                xchk_fblock_set_corrupt(sdc->sc, XFS_DATA_FORK, offset);
-       iput(VFS_I(ip));
+       xfs_irele(ip);
 out:
        return error;
 }

diff --git a/fs/xfs/scrub/parent.c b/fs/xfs/scrub/parent.c
index aacb028..1c9d7c7 100644 (file)
--- a/fs/xfs/scrub/parent.c
+++ b/fs/xfs/scrub/parent.c
@@ -230,11 +230,11 @@ xchk_parent_validate(
 
        /* Drat, parent changed.  Try again! */
        if (dnum != dp->i_ino) {
-               iput(VFS_I(dp));
+               xfs_irele(dp);
                *try_again = true;
                return 0;
        }
-       iput(VFS_I(dp));
+       xfs_irele(dp);
 
        /*
         * '..' didn't change, so check that there was only one entry
@@ -247,7 +247,7 @@ xchk_parent_validate(
 out_unlock:
        xfs_iunlock(dp, XFS_IOLOCK_SHARED);
 out_rele:
-       iput(VFS_I(dp));
+       xfs_irele(dp);
 out:
        return error;
 }

diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c
index 5956b80..6efb926 100644 (file)
--- a/fs/xfs/scrub/scrub.c
+++ b/fs/xfs/scrub/scrub.c
@@ -183,7 +183,7 @@ xchk_teardown(
                        xfs_iunlock(sc->ip, sc->ilock_flags);
                if (sc->ip != ip_in &&
                    !xfs_internal_inum(sc->mp, sc->ip->i_ino))
-                       iput(VFS_I(sc->ip));
+                       xfs_irele(sc->ip);
                sc->ip = NULL;
        }
        if (sc->has_quotaofflock)

diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
index bc5eb2e..e1d6c12 100644 (file)
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -497,7 +497,7 @@ xfs_bui_recover(
        xfs_defer_move(dfops, tp->t_dfops);
        error = xfs_trans_commit(tp);
        xfs_iunlock(ip, XFS_ILOCK_EXCL);
-       IRELE(ip);
+       xfs_irele(ip);
 
        return error;
 
@@ -506,7 +506,7 @@ err_inode:
        xfs_trans_cancel(tp);
        if (ip) {
                xfs_iunlock(ip, XFS_ILOCK_EXCL);
-               IRELE(ip);
+               xfs_irele(ip);
        }
        return error;
 }

diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c
index 3cf4682..f2284ce 100644 (file)
--- a/fs/xfs/xfs_export.c
+++ b/fs/xfs/xfs_export.c
@@ -150,7 +150,7 @@ xfs_nfs_get_inode(
        }
 
        if (VFS_I(ip)->i_generation != generation) {
-               IRELE(ip);
+               xfs_irele(ip);
                return ERR_PTR(-ESTALE);
        }
 

diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index 56a3999..212173c 100644 (file)
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -340,7 +340,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;
 }
 
@@ -389,7 +389,7 @@ xfs_filestream_new_ag(
        if (mru)
                xfs_fstrm_free_func(mp, mru);
 
-       IRELE(pip);
+       xfs_irele(pip);
 exit:
        if (*agp == NULLAGNUMBER)
                *agp = 0;

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 47f417d..8de94ec 100644 (file)
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -716,7 +716,7 @@ xfs_icache_inode_is_allocated(
                return error;
 
        *inuse = !!(VFS_I(ip)->i_mode);
-       IRELE(ip);
+       xfs_irele(ip);
        return 0;
 }
 
@@ -856,7 +856,7 @@ restart:
                            xfs_iflags_test(batch[i], XFS_INEW))
                                xfs_inew_wait(batch[i]);
                        error = execute(batch[i], flags, args);
-                       IRELE(batch[i]);
+                       xfs_irele(batch[i]);
                        if (error == -EAGAIN) {
                                skipped++;
                                continue;

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 0e4bd55..64c694d 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1276,7 +1276,7 @@ xfs_create(
         */
        if (ip) {
                xfs_finish_inode_setup(ip);
-               IRELE(ip);
+               xfs_irele(ip);
        }
 
        xfs_qm_dqrele(udqp);
@@ -1371,7 +1371,7 @@ xfs_create_tmpfile(
         */
        if (ip) {
                xfs_finish_inode_setup(ip);
-               IRELE(ip);
+               xfs_irele(ip);
        }
 
        xfs_qm_dqrele(udqp);
@@ -3134,14 +3134,14 @@ xfs_rename(
 
        error = xfs_finish_rename(tp);
        if (wip)
-               IRELE(wip);
+               xfs_irele(wip);
        return error;
 
 out_trans_cancel:
        xfs_trans_cancel(tp);
 out_release_wip:
        if (wip)
-               IRELE(wip);
+               xfs_irele(wip);
        return error;
 }
 
@@ -3597,3 +3597,12 @@ xfs_iflush_int(
 corrupt_out:
        return -EFSCORRUPTED;
 }
+
+/* Release an inode. */
+void
+xfs_irele(
+       struct xfs_inode        *ip)
+{
+       trace_xfs_irele(ip, _RET_IP_);
+       iput(VFS_I(ip));
+}

diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index c43abf4..8db34d6 100644 (file)
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -483,11 +483,7 @@ static inline void xfs_setup_existing_inode(struct xfs_inode *ip)
        xfs_finish_inode_setup(ip);
 }
 
-#define IRELE(ip) \
-do { \
-       trace_xfs_irele(ip, _THIS_IP_); \
-       iput(VFS_I(ip)); \
-} while (0)
+void xfs_irele(struct xfs_inode *ip);
 
 extern struct kmem_zone        *xfs_inode_zone;
 

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 2eac22b..0ef5ad7 100644 (file)
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -209,7 +209,7 @@ xfs_generic_create(
        xfs_finish_inode_setup(ip);
        if (!tmpfile)
                xfs_cleanup_inode(dir, inode, dentry);
-       iput(inode);
+       xfs_irele(ip);
        goto out_free_acl;
 }
 
@@ -391,7 +391,7 @@ xfs_vn_symlink(
  out_cleanup_inode:
        xfs_finish_inode_setup(cip);
        xfs_cleanup_inode(dir, inode, dentry);
-       iput(inode);
+       xfs_irele(cip);
  out:
        return error;
 }

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 6581082..e9508ba 100644 (file)
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -114,7 +114,7 @@ xfs_bulkstat_one_int(
                break;
        }
        xfs_iunlock(ip, XFS_ILOCK_SHARED);
-       IRELE(ip);
+       xfs_irele(ip);
 
        error = formatter(buffer, ubsize, ubused, buf);
        if (!error)

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 94908a4..7776fde 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -5087,11 +5087,11 @@ xlog_recover_process_one_iunlink(
         */
        ip->i_d.di_dmevmask = 0;
 
-       IRELE(ip);
+       xfs_irele(ip);
        return agino;
 
  fail_iput:
-       IRELE(ip);
+       xfs_irele(ip);
  fail:
        /*
         * We can't read in the inode this bucket points to, or this inode

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 4fb361c..8f739e4 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1039,7 +1039,7 @@ xfs_mountfs(
  out_rtunmount:
        xfs_rtunmount_inodes(mp);
  out_rele_rip:
-       IRELE(rip);
+       xfs_irele(rip);
        /* Clean out dquots that might be in memory after quotacheck. */
        xfs_qm_unmount(mp);
        /*
@@ -1095,7 +1095,7 @@ xfs_unmountfs(
        xfs_fs_unreserve_ag_blocks(mp);
        xfs_qm_unmount_quotas(mp);
        xfs_rtunmount_inodes(mp);
-       IRELE(mp->m_rootip);
+       xfs_irele(mp->m_rootip);
 
        /*
         * We can potentially deadlock here if we have an inode cluster

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 9ceb85c..52ed790 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -231,15 +231,15 @@ xfs_qm_unmount_quotas(
         */
        if (mp->m_quotainfo) {
                if (mp->m_quotainfo->qi_uquotaip) {
-                       IRELE(mp->m_quotainfo->qi_uquotaip);
+                       xfs_irele(mp->m_quotainfo->qi_uquotaip);
                        mp->m_quotainfo->qi_uquotaip = NULL;
                }
                if (mp->m_quotainfo->qi_gquotaip) {
-                       IRELE(mp->m_quotainfo->qi_gquotaip);
+                       xfs_irele(mp->m_quotainfo->qi_gquotaip);
                        mp->m_quotainfo->qi_gquotaip = NULL;
                }
                if (mp->m_quotainfo->qi_pquotaip) {
-                       IRELE(mp->m_quotainfo->qi_pquotaip);
+                       xfs_irele(mp->m_quotainfo->qi_pquotaip);
                        mp->m_quotainfo->qi_pquotaip = NULL;
                }
        }
@@ -1200,12 +1200,12 @@ xfs_qm_dqusage_adjust(
                        goto error0;
        }
 
-       IRELE(ip);
+       xfs_irele(ip);
        *res = BULKSTAT_RV_DIDONE;
        return 0;
 
 error0:
-       IRELE(ip);
+       xfs_irele(ip);
        *res = BULKSTAT_RV_GIVEUP;
        return error;
 }
@@ -1575,11 +1575,11 @@ xfs_qm_init_quotainos(
 
 error_rele:
        if (uip)
-               IRELE(uip);
+               xfs_irele(uip);
        if (gip)
-               IRELE(gip);
+               xfs_irele(gip);
        if (pip)
-               IRELE(pip);
+               xfs_irele(pip);
        return error;
 }
 
@@ -1588,15 +1588,15 @@ xfs_qm_destroy_quotainos(
        xfs_quotainfo_t *qi)
 {
        if (qi->qi_uquotaip) {
-               IRELE(qi->qi_uquotaip);
+               xfs_irele(qi->qi_uquotaip);
                qi->qi_uquotaip = NULL; /* paranoia */
        }
        if (qi->qi_gquotaip) {
-               IRELE(qi->qi_gquotaip);
+               xfs_irele(qi->qi_gquotaip);
                qi->qi_gquotaip = NULL;
        }
        if (qi->qi_pquotaip) {
-               IRELE(qi->qi_pquotaip);
+               xfs_irele(qi->qi_pquotaip);
                qi->qi_pquotaip = NULL;
        }
 }

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index c07c5a3..b319089 100644 (file)
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -190,15 +190,15 @@ xfs_qm_scall_quotaoff(
         * Release our quotainode references if we don't need them anymore.
         */
        if ((dqtype & XFS_QMOPT_UQUOTA) && q->qi_uquotaip) {
-               IRELE(q->qi_uquotaip);
+               xfs_irele(q->qi_uquotaip);
                q->qi_uquotaip = NULL;
        }
        if ((dqtype & XFS_QMOPT_GQUOTA) && q->qi_gquotaip) {
-               IRELE(q->qi_gquotaip);
+               xfs_irele(q->qi_gquotaip);
                q->qi_gquotaip = NULL;
        }
        if ((dqtype & XFS_QMOPT_PQUOTA) && q->qi_pquotaip) {
-               IRELE(q->qi_pquotaip);
+               xfs_irele(q->qi_pquotaip);
                q->qi_pquotaip = NULL;
        }
 
@@ -251,7 +251,7 @@ xfs_qm_scall_trunc_qfile(
 out_unlock:
        xfs_iunlock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
 out_put:
-       IRELE(ip);
+       xfs_irele(ip);
        return error;
 }
 

diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index 205fbb2..a7c0c65 100644 (file)
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -45,7 +45,7 @@ xfs_qm_fill_state(
        tstate->ino_warnlimit = q->qi_iwarnlimit;
        tstate->rt_spc_warnlimit = q->qi_rtbwarnlimit;
        if (tempqip)
-               IRELE(ip);
+               xfs_irele(ip);
 }
 
 /*

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 86d7d2f..926ed31 100644 (file)
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -1207,7 +1207,7 @@ xfs_rtmount_inodes(
        ASSERT(sbp->sb_rsumino != NULLFSINO);
        error = xfs_iget(mp, NULL, sbp->sb_rsumino, 0, 0, &mp->m_rsumip);
        if (error) {
-               IRELE(mp->m_rbmip);
+               xfs_irele(mp->m_rbmip);
                return error;
        }
        ASSERT(mp->m_rsumip != NULL);
@@ -1219,9 +1219,9 @@ xfs_rtunmount_inodes(
        struct xfs_mount        *mp)
 {
        if (mp->m_rbmip)
-               IRELE(mp->m_rbmip);
+               xfs_irele(mp->m_rbmip);
        if (mp->m_rsumip)
-               IRELE(mp->m_rsumip);
+               xfs_irele(mp->m_rsumip);
 }
 
 /*

diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
index ce801ae..2bfe7fb 100644 (file)
--- a/fs/xfs/xfs_symlink.c
+++ b/fs/xfs/xfs_symlink.c
@@ -364,7 +364,7 @@ out_release_inode:
         */
        if (ip) {
                xfs_finish_inode_setup(ip);
-               IRELE(ip);
+               xfs_irele(ip);
        }
 
        xfs_qm_dqrele(udqp);