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

Commit c867cb61 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove XFS_BUF_STALE and XFS_BUF_SUPER_STALE 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 38f23232

fs/xfs/xfs_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -2168,7 +2168,7 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args) 
		 */

		bp = xfs_incore(mp->m_ddev_targp, dblkno, blkcnt, XBF_TRYLOCK);

		if (bp) {

			XFS_BUF_STALE(bp);

			xfs_buf_stale(bp);

			xfs_buf_delwri_dequeue(bp);

			xfs_buf_relse(bp);

			bp = NULL;

fs/xfs/xfs_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ xfs_bioerror( 
	XFS_BUF_UNREAD(bp);

	xfs_buf_delwri_dequeue(bp);

	XFS_BUF_UNDONE(bp);

	XFS_BUF_STALE(bp);

	xfs_buf_stale(bp);



	xfs_buf_ioend(bp, 0);
@@ -1090,7 +1090,7 @@ xfs_bioerror_relse( 
	XFS_BUF_UNREAD(bp);

	xfs_buf_delwri_dequeue(bp);

	XFS_BUF_DONE(bp);

	XFS_BUF_STALE(bp);

	xfs_buf_stale(bp);

	bp->b_iodone = NULL;

	if (!(fl & XBF_ASYNC)) {

		/*

fs/xfs/xfs_buf.h

+0 −6
Original line number Diff line number Diff line
@@ -242,14 +242,8 @@ xfs_buf_target_name(struct xfs_buftarg *target) 
			    XBF_SYNCIO|XBF_FUA|XBF_FLUSH))



void xfs_buf_stale(struct xfs_buf *bp);

#define XFS_BUF_STALE(bp)	xfs_buf_stale(bp);

#define XFS_BUF_UNSTALE(bp)	((bp)->b_flags &= ~XBF_STALE)

#define XFS_BUF_ISSTALE(bp)	((bp)->b_flags & XBF_STALE)

#define XFS_BUF_SUPER_STALE(bp)	do {				\

					XFS_BUF_STALE(bp);	\

					xfs_buf_delwri_dequeue(bp);	\

					XFS_BUF_DONE(bp);	\

				} while (0)



#define XFS_BUF_ISDELAYWRITE(bp)	((bp)->b_flags & XBF_DELWRI)

fs/xfs/xfs_buf_item.c

+4 −2
Original line number Diff line number Diff line
@@ -966,7 +966,9 @@ xfs_buf_iodone_callbacks( 
	 * I/O errors, there's no point in giving this a retry.

	 */

	if (XFS_FORCED_SHUTDOWN(mp)) {

		XFS_BUF_SUPER_STALE(bp);

		xfs_buf_stale(bp);

		xfs_buf_delwri_dequeue(bp);

		XFS_BUF_DONE(bp);

		trace_xfs_buf_item_iodone(bp, _RET_IP_);

		goto do_callbacks;

	}
@@ -1005,7 +1007,7 @@ xfs_buf_iodone_callbacks( 
	 * If the write of the buffer was synchronous, we want to make

	 * sure to return the error to the caller of xfs_bwrite().

	 */

	XFS_BUF_STALE(bp);

	xfs_buf_stale(bp);

	XFS_BUF_DONE(bp);

	xfs_buf_delwri_dequeue(bp);

fs/xfs/xfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -2469,11 +2469,11 @@ xfs_iflush_cluster( 
		 */

		if (bp->b_iodone) {

			XFS_BUF_UNDONE(bp);

			XFS_BUF_STALE(bp);

			xfs_buf_stale(bp);

			xfs_buf_ioerror(bp, EIO);

			xfs_buf_ioend(bp, 0);

		} else {

			XFS_BUF_STALE(bp);

			xfs_buf_stale(bp);

			xfs_buf_relse(bp);

		}

	}