diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-01-16 21:27:58 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-01-16 21:27:58 +0100 |
| commit | c126dea771be1b3c370c0ffc4a09e6a82d492a49 (patch) | |
| tree | 99fc723ba2e89d767e260244cf8d19467bc68c8b /fs/btrfs/extent_io.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 | linux-c126dea771be1b3c370c0ffc4a09e6a82d492a49.tar.xz 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/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 3622cc22ff91..9d09a4f81875 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -18,6 +18,7 @@ #include "ctree.h" #include "btrfs_inode.h" #include "volumes.h" +#include "check-integrity.h" static struct kmem_cache *extent_state_cache; static struct kmem_cache *extent_buffer_cache; @@ -1895,7 +1896,7 @@ int repair_io_failure(struct btrfs_mapping_tree *map_tree, u64 start, } bio->bi_bdev = dev->bdev; bio_add_page(bio, page, length, start-page_offset(page)); - submit_bio(WRITE_SYNC, bio); + btrfsic_submit_bio(WRITE_SYNC, bio); wait_for_completion(&compl); if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) { @@ -2393,7 +2394,7 @@ static int submit_one_bio(int rw, struct bio *bio, int mirror_num, ret = tree->ops->submit_bio_hook(page->mapping->host, rw, bio, mirror_num, bio_flags, start); else - submit_bio(rw, bio); + btrfsic_submit_bio(rw, bio); if (bio_flagged(bio, BIO_EOPNOTSUPP)) ret = -EOPNOTSUPP; |