From: Allison Collins <allison.henderson@oracle.com>
To: Brian Foster <bfoster@redhat.com>, linux-xfs@vger.kernel.org
Subject: Re: [PATCH v4 17/17] xfs: remove unused iget_flags param from xfs_imap_to_bp()
Date: Tue, 5 May 2020 16:40:28 -0700 [thread overview]
Message-ID: <6a8cbce8-e33a-bdde-ad99-09a975a9184f@oracle.com> (raw)
In-Reply-To: <20200504141154.55887-18-bfoster@redhat.com>
On 5/4/20 7:11 AM, Brian Foster wrote:
> 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>
Ok, looks fine to me
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
> ---
> fs/xfs/libxfs/xfs_inode_buf.c | 5 ++---
> fs/xfs/libxfs/xfs_inode_buf.h | 2 +-
> fs/xfs/scrub/ialloc.c | 3 +--
> fs/xfs/xfs_inode.c | 7 +++----
> fs/xfs/xfs_log_recover.c | 2 +-
> 5 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index b102e611bf54..81a010422bea 100644
> --- 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 9b373dcf9e34..d9b4781ac9fd 100644
> --- 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 64c217eb06a7..6517d67e8d51 100644
> --- 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 e0d9a5bf7507..4f915b91b9fd 100644
> --- 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 11c3502b07b1..6a98fd9f00b3 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -4987,7 +4987,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;
>
>
next prev parent reply other threads:[~2020-05-05 23:40 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 14:11 [PATCH v4 00/17] xfs: flush related error handling cleanups Brian Foster
2020-05-04 14:11 ` [PATCH v4 01/17] xfs: refactor failed buffer resubmission into xfsaild Brian Foster
2020-05-04 14:11 ` [PATCH v4 02/17] xfs: factor out buffer I/O failure code Brian Foster
2020-05-04 14:11 ` [PATCH v4 03/17] xfs: simplify inode flush error handling Brian Foster
2020-05-04 21:31 ` Darrick J. Wong
2020-05-05 21:09 ` Allison Collins
2020-05-04 14:11 ` [PATCH v4 04/17] xfs: remove unnecessary shutdown check from xfs_iflush() Brian Foster
2020-05-04 14:11 ` [PATCH v4 05/17] xfs: reset buffer write failure state on successful completion Brian Foster
2020-05-05 21:09 ` Allison Collins
2020-05-05 21:09 ` Allison Collins
2020-05-04 14:11 ` [PATCH v4 06/17] xfs: refactor ratelimited buffer error messages into helper Brian Foster
2020-05-05 21:09 ` Allison Collins
2020-05-04 14:11 ` [PATCH v4 07/17] xfs: ratelimit unmount time per-buffer I/O error alert Brian Foster
2020-05-05 21:10 ` Allison Collins
2020-05-06 11:05 ` [PATCH v4.1 " Brian Foster
2020-05-07 20:48 ` Dave Chinner
2020-05-04 14:11 ` [PATCH v4 08/17] xfs: fix duplicate verification from xfs_qm_dqflush() Brian Foster
2020-05-05 21:22 ` Allison Collins
2020-05-04 14:11 ` [PATCH v4 09/17] xfs: abort consistently on dquot flush failure Brian Foster
2020-05-04 14:11 ` [PATCH v4 10/17] xfs: acquire ->ail_lock from xfs_trans_ail_delete() Brian Foster
2020-05-05 22:22 ` Allison Collins
2020-05-04 14:11 ` [PATCH v4 11/17] xfs: use delete helper for items expected to be in AIL Brian Foster
2020-05-05 23:17 ` Allison Collins
2020-05-04 14:11 ` [PATCH v4 12/17] xfs: drop unused shutdown parameter from xfs_trans_ail_remove() Brian Foster
2020-05-05 23:20 ` Allison Collins
2020-05-04 14:11 ` [PATCH v4 13/17] xfs: combine xfs_trans_ail_[remove|delete]() Brian Foster
2020-05-05 23:35 ` Allison Collins
2020-05-04 14:11 ` [PATCH v4 14/17] xfs: remove unused iflush stale parameter Brian Foster
2020-05-04 14:11 ` [PATCH v4 15/17] xfs: random buffer write failure errortag Brian Foster
2020-05-04 14:11 ` [PATCH v4 16/17] xfs: remove unused shutdown types Brian Foster
2020-05-05 23:37 ` Allison Collins
2020-05-04 14:11 ` [PATCH v4 17/17] xfs: remove unused iget_flags param from xfs_imap_to_bp() Brian Foster
2020-05-05 23:40 ` Allison Collins [this message]
2020-05-04 21:53 ` [PATCH v4 00/17] xfs: flush related error handling cleanups Dave Chinner
2020-05-05 11:58 ` Brian Foster
2020-05-05 22:36 ` Dave Chinner
2020-05-06 11:04 ` Brian Foster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6a8cbce8-e33a-bdde-ad99-09a975a9184f@oracle.com \
--to=allison.henderson@oracle.com \
--cc=bfoster@redhat.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox