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

Commit 958d4ec6 authored Apr 10, 2008 by David Chinner Committed by Lachlan McIlroy Apr 18, 2008

[XFS] xfs_bdwrite() does not return errors.



xfs_bdwrite() cannot return an error; it only queues buffers to the
delayed write list and as such never encounters anything that can fail.
Mark it void.

SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30825a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

parent db7a19f2

fs/xfs/linux-2.6/xfs_buf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1060,7 +1060,7 @@ xfs_buf_iostart(
	bp->b_flags &= ~(XBF_READ \| XBF_WRITE \| XBF_ASYNC);		bp->b_flags &= ~(XBF_READ \| XBF_WRITE \| XBF_ASYNC);
	bp->b_flags \|= flags & (XBF_DELWRI \| XBF_ASYNC);		bp->b_flags \|= flags & (XBF_DELWRI \| XBF_ASYNC);
	xfs_buf_delwri_queue(bp, 1);		xfs_buf_delwri_queue(bp, 1);
	return status;		return 0;
	}		}

	bp->b_flags &= ~(XBF_READ \| XBF_WRITE \| XBF_ASYNC \| XBF_DELWRI \| \		bp->b_flags &= ~(XBF_READ \| XBF_WRITE \| XBF_ASYNC \| XBF_DELWRI \| \

fs/xfs/linux-2.6/xfs_buf.h

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -387,11 +387,15 @@ static inline int XFS_bwrite(xfs_buf_t *bp)
	return error;		return error;
	}		}

	static inline int xfs_bdwrite(void mp, xfs_buf_t bp)		/*
			* No error can be returned from xfs_buf_iostart for delwri
			* buffers as they are queued and no I/O is issued.
			*/
			static inline void xfs_bdwrite(void mp, xfs_buf_t bp)
	{		{
	bp->b_strat = xfs_bdstrat_cb;		bp->b_strat = xfs_bdstrat_cb;
	bp->b_fspriv3 = mp;		bp->b_fspriv3 = mp;
	return xfs_buf_iostart(bp, XBF_DELWRI \| XBF_ASYNC);		(void)xfs_buf_iostart(bp, XBF_DELWRI \| XBF_ASYNC);
	}		}

	#define XFS_bdstrat(bp) xfs_buf_iorequest(bp)		#define XFS_bdstrat(bp) xfs_buf_iorequest(bp)