xfs: remove unused iget_flags param from xfs_imap_to_bp()

iget_flags is unused in xfs_imap_to_bp(). Remove the parameter and
fix up the callers.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index b102e611bf540ae31078fa108372416a7524ddd5..81a010422bea31650a7889e72a5a955a27ad34c2 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -161,8 +161,7 @@ xfs_imap_to_bp(
        struct xfs_imap         *imap,
        struct xfs_dinode       **dipp,
        struct xfs_buf          **bpp,
-       uint                    buf_flags,
-       uint                    iget_flags)
+       uint                    buf_flags)
 {
        struct xfs_buf          *bp;
        int                     error;
@@ -621,7 +620,7 @@ xfs_iread(
        /*
         * Get pointers to the on-disk inode and the buffer containing it.
         */
-       error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0, iget_flags);
+       error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0);
        if (error)
                return error;
 

diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
index 9b373dcf9e34d87553499eb74dac8e1f303bd385..d9b4781ac9fd4ea0a86fb597f298ba49cc3ae223 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.h
+++ b/fs/xfs/libxfs/xfs_inode_buf.h
@@ -48,7 +48,7 @@ struct xfs_imap {
 
 int    xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *,
                       struct xfs_imap *, struct xfs_dinode **,
-                      struct xfs_buf **, uint, uint);
+                      struct xfs_buf **, uint);
 int    xfs_iread(struct xfs_mount *, struct xfs_trans *,
                  struct xfs_inode *, uint);
 void   xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *);

diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c
index 64c217eb06a782869205a9b13eb9bf48feb0fa48..6517d67e8d51f84acb0b744f3ac3469f80111a93 100644 (file)
--- a/fs/xfs/scrub/ialloc.c
+++ b/fs/xfs/scrub/ialloc.c
@@ -278,8 +278,7 @@ xchk_iallocbt_check_cluster(
                        &XFS_RMAP_OINFO_INODES);
 
        /* Grab the inode cluster buffer. */
-       error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &dip, &cluster_bp,
-                       0, 0);
+       error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &dip, &cluster_bp, 0);
        if (!xchk_btree_xref_process_error(bs->sc, bs->cur, 0, &error))
                return error;
 

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index e094afe2843998b46e65609d491170821d00bfe7..ab31a5dec7aab16eb9d920cbec50a4f12b066307 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2172,7 +2172,7 @@ xfs_iunlink_update_inode(
 
        ASSERT(xfs_verify_agino_or_null(mp, agno, next_agino));
 
-       error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &ibp, 0, 0);
+       error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &ibp, 0);
        if (error)
                return error;
 
@@ -2302,7 +2302,7 @@ xfs_iunlink_map_ino(
                return error;
        }
 
-       error = xfs_imap_to_bp(mp, tp, imap, dipp, bpp, 0, 0);
+       error = xfs_imap_to_bp(mp, tp, imap, dipp, bpp, 0);
        if (error) {
                xfs_warn(mp, "%s: xfs_imap_to_bp returned error %d.",
                                __func__, error);
@@ -3665,8 +3665,7 @@ xfs_iflush(
         * If we get any other error, we effectively have a corruption situation
         * and we cannot flush the inode. Abort the flush and shut down.
         */
-       error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK,
-                              0);
+       error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK);
        if (error == -EAGAIN) {
                xfs_ifunlock(ip);
                return error;

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index d0e2dd81de5392249f4f7005ded97e7f1645dee3..320785115833278fe8c227ca3748721584eade02 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -4969,7 +4969,7 @@ xlog_recover_process_one_iunlink(
        /*
         * Get the on disk inode to find the next inode in the bucket.
         */
-       error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &ibp, 0, 0);
+       error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &ibp, 0);
        if (error)
                goto fail_iput;