Commit e5702805 authored by Chandra Seetharaman's avatar Chandra Seetharaman Committed by Alex Elder
Browse files

xfs: replace xfs_buf_geterror() with bp->b_error 



Since we just checked bp for NULL, it is ok to replace
xfs_buf_geterror() with bp->b_error in these places.

Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent ac4d6888

fs/xfs/xfs_log_recover.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2133,7 +2133,7 @@ xlog_recover_buffer_pass2( 
			  buf_flags);

			  buf_flags);

	if (!bp)

	if (!bp)

		return XFS_ERROR(ENOMEM);

		return XFS_ERROR(ENOMEM);

	error = xfs_buf_geterror(bp);

	error = bp->b_error;

	if (error) {

	if (error) {

		xfs_ioerror_alert("xlog_recover_do..(read#1)", mp,

		xfs_ioerror_alert("xlog_recover_do..(read#1)", mp,

				  bp, buf_f->blf_blkno);

				  bp, buf_f->blf_blkno);
@@ -2228,7 +2228,7 @@ xlog_recover_inode_pass2( 
		error = ENOMEM;

		error = ENOMEM;

		goto error;

		goto error;

	}

	}

	error = xfs_buf_geterror(bp);

	error = bp->b_error;

	if (error) {

	if (error) {

		xfs_ioerror_alert("xlog_recover_do..(read#2)", mp,

		xfs_ioerror_alert("xlog_recover_do..(read#2)", mp,

				  bp, in_f->ilf_blkno);

				  bp, in_f->ilf_blkno);

fs/xfs/xfs_vnodeops.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ xfs_readlink_bmap( 
				  XBF_LOCK | XBF_MAPPED | XBF_DONT_BLOCK);

				  XBF_LOCK | XBF_MAPPED | XBF_DONT_BLOCK);

		if (!bp)

		if (!bp)

			return XFS_ERROR(ENOMEM);

			return XFS_ERROR(ENOMEM);

		error = xfs_buf_geterror(bp);

		error = bp->b_error;

		if (error) {

		if (error) {

			xfs_ioerror_alert("xfs_readlink",

			xfs_ioerror_alert("xfs_readlink",

				  ip->i_mount, bp, XFS_BUF_ADDR(bp));

				  ip->i_mount, bp, XFS_BUF_ADDR(bp));

CRA Git | Maintained and supported by SUSTech CRA and CCSE