diff options
| author | Chris Mason | 2012-01-16 21:27:58 +0100 |
|---|---|---|
| committer | Chris Mason | 2012-01-16 21:27:58 +0100 |
| commit | c126dea771be1b3c370c0ffc4a09e6a82d492a49 (patch) | |
| tree | 99fc723ba2e89d767e260244cf8d19467bc68c8b /fs/btrfs/scrub.c | |
| parent | Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integ... (diff) | |
| parent | Btrfs: integrate integrity check module into btrfs (diff) | |
| download | kernel-qcow2-linux-c126dea771be1b3c370c0ffc4a09e6a82d492a49.tar.gz kernel-qcow2-linux-c126dea771be1b3c370c0ffc4a09e6a82d492a49.tar.xz kernel-qcow2-linux-c126dea771be1b3c370c0ffc4a09e6a82d492a49.zip | |
Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs into integration
Conflicts:
fs/btrfs/ctree.h
fs/btrfs/super.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 6a6a51a809ba..9770cc5bfb76 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -25,6 +25,7 @@ #include "transaction.h" #include "backref.h" #include "extent_io.h" +#include "check-integrity.h" /* * This is only the first step towards a full-features scrub. It reads all @@ -733,7 +734,7 @@ static int scrub_fixup_io(int rw, struct block_device *bdev, sector_t sector, bio_add_page(bio, page, PAGE_SIZE, 0); bio->bi_end_io = scrub_fixup_end_io; bio->bi_private = &complete; - submit_bio(rw, bio); + btrfsic_submit_bio(rw, bio); /* this will also unplug the queue */ wait_for_completion(&complete); @@ -959,7 +960,7 @@ static int scrub_submit(struct scrub_dev *sdev) sdev->curr = -1; atomic_inc(&sdev->in_flight); - submit_bio(READ, sbio->bio); + btrfsic_submit_bio(READ, sbio->bio); return 0; } |