[PATCH 03a/48] xfs: don't verify bmbt reads twice

[Ben Myers]

On Tue, Jul 23, 2013 at 01:26:48PM -0500, Ben Myers wrote:
> On Fri, Jun 07, 2013 at 10:25:26AM +1000, Dave Chinner wrote:
> > From: Dave Chinner <dchinner at redhat.com>
> > 
> > Signed-off-by: Dave Chinner <dchinner at redhat.com>
> 
> This patch mostly corresponds to commit ee1a47ab0e, and in some areas it is
> equivalent but slightly different.  There are some other things in here too:
> 
> * Addition of XFS_BUF_DADDR_NULL
> * rename of b_blkno to b_bn in struct xfs_buf
> * rename of b_fsprivate to b_fspriv in struct xfs_buf
> * addition of uuid_copy and uuid_equal, and libuuid to build
> 
> It all looks fine to me, except as below:
> 
> >  static void
> > @@ -733,13 +760,29 @@ xfs_bmbt_read_verify(
> >  	struct xfs_buf	*bp)
> >  {
> >  	xfs_bmbt_verify(bp);
> 	^^^^^^^^^^^^^^^^^^^^
> In commit ee1a47ab0e we removed this call.

From: Ben Myers <bpm at sgi.com>

xfs: don't verify bmbt reads twice

xfs_bmbt_read_verify is calling xfs_bmbt_verify twice in a row.  commit
ee1a47ab0e in the kernel removed the first xfs_bmbt_verify but this was
not carried over when it was implemented in userspace.

Signed-off-by: Ben Myers <bpm at sgi.com>

---
 libxfs/xfs_bmap_btree.c |    2 --
 1 file changed, 2 deletions(-)

Index: b/libxfs/xfs_bmap_btree.c
===================================================================
--- a/libxfs/xfs_bmap_btree.c	2013-08-06 10:18:21.600252696 -0500
+++ b/libxfs/xfs_bmap_btree.c	2013-08-06 10:21:59.630817672 -0500
@@ -759,7 +759,6 @@ static void
 xfs_bmbt_read_verify(
 	struct xfs_buf	*bp)
 {
-	xfs_bmbt_verify(bp);
 	if (!(xfs_btree_lblock_verify_crc(bp) &&
 	      xfs_bmbt_verify(bp))) {
 		trace_xfs_btree_corrupt(bp, _RET_IP_);
@@ -767,7 +766,6 @@ xfs_bmbt_read_verify(
 				     bp->b_target->bt_mount, bp->b_addr);
 		xfs_buf_ioerror(bp, EFSCORRUPTED);
 	}
-
 }
 
 static void