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

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

xfs: do not call xfs_bdstrat_cb in xfs_buf_iodone_callbacks 



xfs_bdstrat_cb only adds a check for a shutdown filesystem over
xfs_buf_iorequest, but xfs_buf_iodone_callbacks just checked for a shut down
filesystem a little earlier.  In addition the shutdown handling in
xfs_bdstrat_cb is not very suitable for this caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 08023d6d

fs/xfs/xfs_buf.c

+22 −29
Original line number Diff line number Diff line
@@ -1049,27 +1049,6 @@ xfs_buf_ioerror_alert( 
		(__uint64_t)XFS_BUF_ADDR(bp), func, bp->b_error, bp->b_length);

}



int

xfs_bwrite(

	struct xfs_buf		*bp)

{

	int			error;



	ASSERT(xfs_buf_islocked(bp));



	bp->b_flags |= XBF_WRITE;

	bp->b_flags &= ~(XBF_ASYNC | XBF_READ | _XBF_DELWRI_Q);



	xfs_bdstrat_cb(bp);



	error = xfs_buf_iowait(bp);

	if (error) {

		xfs_force_shutdown(bp->b_target->bt_mount,

				   SHUTDOWN_META_IO_ERROR);

	}

	return error;

}



/*

 * Called when we want to stop a buffer from getting written or read.

 * We attach the EIO error, muck with its flags, and call xfs_buf_ioend
@@ -1139,14 +1118,7 @@ xfs_bioerror_relse( 
	return EIO;

}





/*

 * All xfs metadata buffers except log state machine buffers

 * get this attached as their b_bdstrat callback function.

 * This is so that we can catch a buffer

 * after prematurely unpinning it to forcibly shutdown the filesystem.

 */

int

STATIC int

xfs_bdstrat_cb(

	struct xfs_buf	*bp)

{
@@ -1167,6 +1139,27 @@ xfs_bdstrat_cb( 
	return 0;

}



int

xfs_bwrite(

	struct xfs_buf		*bp)

{

	int			error;



	ASSERT(xfs_buf_islocked(bp));



	bp->b_flags |= XBF_WRITE;

	bp->b_flags &= ~(XBF_ASYNC | XBF_READ | _XBF_DELWRI_Q);



	xfs_bdstrat_cb(bp);



	error = xfs_buf_iowait(bp);

	if (error) {

		xfs_force_shutdown(bp->b_target->bt_mount,

				   SHUTDOWN_META_IO_ERROR);

	}

	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

fs/xfs/xfs_buf.h

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ extern void xfs_buf_unlock(xfs_buf_t *); 
extern int xfs_bwrite(struct xfs_buf *bp);



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

extern int xfs_bdstrat_cb(struct xfs_buf *);



extern void xfs_buf_ioend(xfs_buf_t *,	int);

extern void xfs_buf_ioerror(xfs_buf_t *, int);

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Diff line number Diff line
@@ -1101,7 +1101,7 @@ xfs_buf_iodone_callbacks( 


		if (!XFS_BUF_ISSTALE(bp)) {

			bp->b_flags |= XBF_WRITE | XBF_ASYNC | XBF_DONE;

			xfs_bdstrat_cb(bp);

			xfs_buf_iorequest(bp);

		} else {

			xfs_buf_relse(bp);

		}