xfs: remove unused iget_flags param from xfs_imap_to_bp()

Source kernel commit: c199507993ede3f63d0deae7e2cbc2f5462c6452

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/trans.c b/libxfs/trans.c
index 6e0b1667c3e89fa7c4855a1c15fd55ee567e53b5..a61f803fe32d80a165b890a739a75773f3001ac6 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -811,7 +811,7 @@ inode_item_done(
        /*
         * Get the buffer containing the on-disk inode.
         */
-       error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, 0, 0);
+       error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, 0);
        if (error) {
                fprintf(stderr, _("%s: warning - imap_to_bp failed (%d)\n"),
                        progname, error);

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index e94f5bf70f9dc5ba7b0b970e0c8c9b828a04c29a..0a2d76e875bd4a6182da2fe43f9d523e5b27da5c 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -158,8 +158,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;
@@ -618,7 +617,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/libxfs/xfs_inode_buf.h b/libxfs/xfs_inode_buf.h
index 9b373dcf9e34d87553499eb74dac8e1f303bd385..d9b4781ac9fd4ea0a86fb597f298ba49cc3ae223 100644 (file)
--- a/libxfs/xfs_inode_buf.h
+++ b/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 *);