xfsprogs: cleanup miscellaneous merge faults

* clean up a few extra tabs
* xfs_buf_map->xfs_buf_ops in libxfs_readbuf and libxfs_readbuf_map args
* don't call the write verifier twice
* put the multithreaded scan_ags back

Signed-off-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/include/libxfs.h b/include/libxfs.h
index 533d336e37eb9920b5814f855ff8ff87f0d3cf0b..ffd83bfb4eaec1c2cb9b259907dc01955fa10a08 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -589,7 +589,7 @@ typedef struct xfs_inode {
        xfs_mount_t             *i_mount;       /* fs mount struct ptr */
        xfs_ino_t               i_ino;          /* inode number (agno/agino) */
        struct xfs_imap         i_imap;         /* location for xfs_imap() */
-       struct xfs_buftarg                      i_dev;          /* dev for this inode */
+       struct xfs_buftarg      i_dev;          /* dev for this inode */
        xfs_ifork_t             *i_afp;         /* attribute fork pointer */
        xfs_ifork_t             i_df;           /* data fork */
        xfs_trans_t             *i_transp;      /* ptr to owning transaction */

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 92a90f1540baae88e7afaf8115c42e3450239b9b..13dbd23b9f4782e8e77c129bc471e7e3396859e4 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -198,9 +198,9 @@ libxfs_log_header(
 #undef libxfs_putbuf
 
 xfs_buf_t      *libxfs_readbuf(struct xfs_buftarg *, xfs_daddr_t, int, int,
-                               const struct xfs_buf_map *);
+                               const struct xfs_buf_ops *);
 xfs_buf_t      *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *,
-                               int, int, const struct xfs_buf_map *);
+                               int, int, const struct xfs_buf_ops *);
 int            libxfs_writebuf(xfs_buf_t *, int);
 xfs_buf_t      *libxfs_getbuf(struct xfs_buftarg *, xfs_daddr_t, int);
 xfs_buf_t      *libxfs_getbuf_map(struct xfs_buftarg *, struct xfs_buf_map *, int);
@@ -831,22 +831,6 @@ libxfs_writebufr(xfs_buf_t *bp)
                }
        }
 
-       /*
-        * clear any pre-existing error status on the buffer. This can occur if
-        * the buffer is corrupt on disk and the repair process doesn't clear
-        * the error before fixing and writing it back.
-        */
-       bp->b_error = 0;
-       if (bp->b_ops) {
-               bp->b_ops->verify_write(bp);
-               if (bp->b_error) {
-                       fprintf(stderr,
-       _("%s: write verifer failed on bno 0x%llx/0x%x\n"),
-                               __func__, (long long)bp->b_bn, bp->b_bcount);
-                       return bp->b_error;
-               }
-       }
-
        if (!(bp->b_flags & LIBXFS_B_DISCONTIG)) {
                error = __write_buf(fd, bp->b_addr, bp->b_bcount,
                                    LIBXFS_BBTOOFF64(bp->b_bn), bp->b_flags);

diff --git a/repair/scan.c b/repair/scan.c
index 4f8bbef74d0f5733a7acb315aa59f56396c72b4c..49ed1946245f461319a3b7d1930dc74dcfb2d0f0 100644 (file)
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -1370,8 +1370,7 @@ scan_ags(
        }
        memset(agcnts, 0, mp->m_sb.sb_agcount * sizeof(*agcnts));
 
-       create_work_queue(&wq, mp, 1);
-       //create_work_queue(&wq, mp, scan_threads);
+       create_work_queue(&wq, mp, scan_threads);
 
        for (i = 0; i < mp->m_sb.sb_agcount; i++)
                queue_work(&wq, scan_ag, i, &agcnts[i]);