Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f5af7ea authored Sep 17, 2017 by Brian Foster Committed by Greg Kroah-Hartman Sep 20, 2017

xfs: open-code xfs_buf_item_dirty()



commit a4f6cf6b2b6b60ec2a05a33a32e65caa4149aa2b upstream.

It checks a single flag and has one caller. It probably isn't worth
its own function.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 81286ade

fs/xfs/xfs_buf_item.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -945,17 +945,6 @@ xfs_buf_item_log(
		}


		/*
		* Return 1 if the buffer has been logged or ordered in a transaction (at any
		* point, not just the current transaction) and 0 if not.
		*/
		uint
		xfs_buf_item_dirty(
		xfs_buf_log_item_t *bip)
		{
		return (bip->bli_flags & XFS_BLI_DIRTY);
		}

		STATIC void
		xfs_buf_item_free(
		xfs_buf_log_item_t *bip)

fs/xfs/xfs_buf_item.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ typedef struct xfs_buf_log_item {
		int xfs_buf_item_init(struct xfs_buf , struct xfs_mount );
		void xfs_buf_item_relse(struct xfs_buf *);
		void xfs_buf_item_log(xfs_buf_log_item_t *, uint, uint);
		uint xfs_buf_item_dirty(xfs_buf_log_item_t *);
		void xfs_buf_attach_iodone(struct xfs_buf *,
		void()(struct xfs_buf , xfs_log_item_t *),
		xfs_log_item_t *);

fs/xfs/xfs_trans_buf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -435,7 +435,7 @@ xfs_trans_brelse(xfs_trans_t *tp,
		if (XFS_FORCED_SHUTDOWN(tp->t_mountp) && freed) {
		xfs_trans_ail_remove(&bip->bli_item, SHUTDOWN_LOG_IO_ERROR);
		xfs_buf_item_relse(bp);
		} else if (!xfs_buf_item_dirty(bip)) {
		} else if (!(bip->bli_flags & XFS_BLI_DIRTY)) {
		/***
		ASSERT(bp->b_pincount == 0);
		***/