]> git-server-git.apps.pok.os.sepia.ceph.com Git - xfsprogs-dev.git/commit
xfsprogs: cleanup miscellaneous merge faults
authorDave Chinner <dchinner@redhat.com>
Wed, 4 Sep 2013 22:05:59 +0000 (22:05 +0000)
committerRich Johnston <rjohnston@sgi.com>
Mon, 16 Sep 2013 20:16:51 +0000 (15:16 -0500)
commitf756f80ce8daf2047190386fcad75b00339def3d
tree1685226346c3e282aed05c5063d2503b1c696237
parentb5fa9e86b131de04aa0aaa0f5710cb633873a872
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>
include/libxfs.h
libxfs/rdwr.c
repair/scan.c