Commit 83a0adc3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ben Myers
Browse files

xfs: remove xfsbdstrat error 



The xfsbdstrat helper is a small but useless wrapper for xfs_buf_iorequest that
handles the case of a shut down filesystem.  Most of the users have private,
uncached buffers that can just be freed in this case, but the complex error
handling in xfs_bioerror_relse messes up the case when it's called without
a locked buffer.

Remove xfsbdstrat and opencode the error handling in the callers.  All but
one can simply return an error and don't need to deal with buffer state,
and the one caller that cares about the buffer state could do with a major
cleanup as well, but we'll defer that to later.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBen Myers <bpm@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 6e708bcf

fs/xfs/xfs_bmap_util.c

+12 −2
Original line number Diff line number Diff line
@@ -1187,7 +1187,12 @@ xfs_zero_remaining_bytes( 
		XFS_BUF_UNWRITE(bp);

		XFS_BUF_READ(bp);

		XFS_BUF_SET_ADDR(bp, xfs_fsb_to_db(ip, imap.br_startblock));

		xfsbdstrat(mp, bp);



		if (XFS_FORCED_SHUTDOWN(mp)) {

			error = XFS_ERROR(EIO);

			break;

		}

		xfs_buf_iorequest(bp);

		error = xfs_buf_iowait(bp);

		if (error) {

			xfs_buf_ioerror_alert(bp,
@@ -1200,7 +1205,12 @@ xfs_zero_remaining_bytes( 
		XFS_BUF_UNDONE(bp);

		XFS_BUF_UNREAD(bp);

		XFS_BUF_WRITE(bp);

		xfsbdstrat(mp, bp);



		if (XFS_FORCED_SHUTDOWN(mp)) {

			error = XFS_ERROR(EIO);

			break;

		}

		xfs_buf_iorequest(bp);

		error = xfs_buf_iowait(bp);

		if (error) {

			xfs_buf_ioerror_alert(bp,

fs/xfs/xfs_buf.c

+6 −21
Original line number Diff line number Diff line
@@ -698,7 +698,11 @@ xfs_buf_read_uncached( 
	bp->b_flags |= XBF_READ;

	bp->b_ops = ops;



	xfsbdstrat(target->bt_mount, bp);

	if (XFS_FORCED_SHUTDOWN(target->bt_mount)) {

		xfs_buf_relse(bp);

		return NULL;

	}

	xfs_buf_iorequest(bp);

	xfs_buf_iowait(bp);

	return bp;

}
@@ -1089,7 +1093,7 @@ xfs_bioerror( 
 * This is meant for userdata errors; metadata bufs come with

 * iodone functions attached, so that we can track down errors.

 */

STATIC int

int

xfs_bioerror_relse(

	struct xfs_buf	*bp)

{
@@ -1164,25 +1168,6 @@ xfs_bwrite( 
	return error;

}



/*

 * Wrapper around bdstrat so that we can stop data from going to disk in case

 * we are shutting down the filesystem.  Typically user data goes thru this

 * path; one of the exceptions is the superblock.

 */

void

xfsbdstrat(

	struct xfs_mount	*mp,

	struct xfs_buf		*bp)

{

	if (XFS_FORCED_SHUTDOWN(mp)) {

		trace_xfs_bdstrat_shut(bp, _RET_IP_);

		xfs_bioerror_relse(bp);

		return;

	}



	xfs_buf_iorequest(bp);

}



STATIC void

_xfs_buf_ioend(

	xfs_buf_t		*bp,

fs/xfs/xfs_buf.h

+2 −3
Original line number Diff line number Diff line
@@ -269,9 +269,6 @@ extern void xfs_buf_unlock(xfs_buf_t *); 


/* Buffer Read and Write Routines */

extern int xfs_bwrite(struct xfs_buf *bp);



extern void xfsbdstrat(struct xfs_mount *, struct xfs_buf *);



extern void xfs_buf_ioend(xfs_buf_t *,	int);

extern void xfs_buf_ioerror(xfs_buf_t *, int);

extern void xfs_buf_ioerror_alert(struct xfs_buf *, const char *func);
@@ -282,6 +279,8 @@ extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *, 
#define xfs_buf_zero(bp, off, len) \

	    xfs_buf_iomove((bp), (off), (len), NULL, XBRW_ZERO)



extern int xfs_bioerror_relse(struct xfs_buf *);



static inline int xfs_buf_geterror(xfs_buf_t *bp)

{

	return bp ? bp->b_error : ENOMEM;

fs/xfs/xfs_log_recover.c

+11 −2
Original line number Diff line number Diff line
@@ -193,7 +193,10 @@ xlog_bread_noalign( 
	bp->b_io_length = nbblks;

	bp->b_error = 0;



	xfsbdstrat(log->l_mp, bp);

	if (XFS_FORCED_SHUTDOWN(log->l_mp))

		return XFS_ERROR(EIO);



	xfs_buf_iorequest(bp);

	error = xfs_buf_iowait(bp);

	if (error)

		xfs_buf_ioerror_alert(bp, __func__);
@@ -4397,7 +4400,13 @@ xlog_do_recover( 
	XFS_BUF_READ(bp);

	XFS_BUF_UNASYNC(bp);

	bp->b_ops = &xfs_sb_buf_ops;

	xfsbdstrat(log->l_mp, bp);



	if (XFS_FORCED_SHUTDOWN(log->l_mp)) {

		xfs_buf_relse(bp);

		return XFS_ERROR(EIO);

	}



	xfs_buf_iorequest(bp);

	error = xfs_buf_iowait(bp);

	if (error) {

		xfs_buf_ioerror_alert(bp, __func__);

fs/xfs/xfs_trans_buf.c

+12 −1
Original line number Diff line number Diff line
@@ -314,7 +314,18 @@ xfs_trans_read_buf_map( 
			ASSERT(bp->b_iodone == NULL);

			XFS_BUF_READ(bp);

			bp->b_ops = ops;

			xfsbdstrat(tp->t_mountp, bp);



			/*

			 * XXX(hch): clean up the error handling here to be less

			 * of a mess..

			 */

			if (XFS_FORCED_SHUTDOWN(mp)) {

				trace_xfs_bdstrat_shut(bp, _RET_IP_);

				xfs_bioerror_relse(bp);

			} else {

				xfs_buf_iorequest(bp);

			}



			error = xfs_buf_iowait(bp);

			if (error) {

				xfs_buf_ioerror_alert(bp, __func__);

CRA Git | Maintained and supported by SUSTech CRA and CCSE