6 files changed, 79 insertions, 11 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 67385033323..39f6188688e 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -971,7 +971,7 @@ struct btrfs_fs_info {
          * is required instead of the faster short fsync log commits
          */
         u64 last_trans_log_full_commit;
-        unsigned long mount_opt:20;
+        unsigned long mount_opt:21;
         unsigned long compress_type:4;
         u64 max_inline;
         u64 alloc_start;
@@ -1155,6 +1155,10 @@ struct btrfs_fs_info {
         int scrub_workers_refcnt;
         struct btrfs_workers scrub_workers;
 
+#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
+        u32 check_integrity_print_mask;
+#endif
+
         /* filesystem state */
         u64 fs_state;
 
@@ -1413,6 +1417,8 @@ struct btrfs_ioctl_defrag_range_args {
 #define BTRFS_MOUNT_AUTO_DEFRAG         (1 << 16)
 #define BTRFS_MOUNT_INODE_MAP_CACHE     (1 << 17)
 #define BTRFS_MOUNT_RECOVERY            (1 << 18)
+#define BTRFS_MOUNT_CHECK_INTEGRITY     (1 << 19)
+#define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 20)
 
 #define btrfs_clear_opt(o, opt)         ((o) &= ~BTRFS_MOUNT_##opt)
 #define btrfs_set_opt(o, opt)           ((o) |= BTRFS_MOUNT_##opt)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 3f9d5551e58..f363c6d9c3d 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -43,6 +43,7 @@
 #include "tree-log.h"
 #include "free-space-cache.h"
 #include "inode-map.h"
+#include "check-integrity.h"
 
 static struct extent_io_ops btree_extent_io_ops;
 static void end_workqueue_fn(struct btrfs_work *work);
@@ -2001,6 +2002,9 @@ struct btrfs_root *open_ctree(struct super_block *sb,
         init_waitqueue_head(&fs_info->scrub_pause_wait);
         init_rwsem(&fs_info->scrub_super_lock);
         fs_info->scrub_workers_refcnt = 0;
+#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
+        fs_info->check_integrity_print_mask = 0;
+#endif
 
         sb->s_blocksize = 4096;
         sb->s_blocksize_bits = blksize_bits(4096);
@@ -2356,6 +2360,19 @@ retry_root_backup:
                 btrfs_set_opt(fs_info->mount_opt, SSD);
         }
 
+#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
+        if (btrfs_test_opt(tree_root, CHECK_INTEGRITY)) {
+                ret = btrfsic_mount(tree_root, fs_devices,
+                                    btrfs_test_opt(tree_root,
+                                        CHECK_INTEGRITY_INCLUDING_EXTENT_DATA) ?
+                                    1 : 0,
+                                    fs_info->check_integrity_print_mask);
+                if (ret)
+                        printk(KERN_WARNING "btrfs: failed to initialize"
+                               " integrity check module %s\n", sb->s_id);
+        }
+#endif
+
         /* do not make disk changes in broken FS */
         if (btrfs_super_log_root(disk_super) != 0 &&
             !(fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR)) {
@@ -2634,7 +2651,7 @@ static int write_dev_supers(struct btrfs_device *device,
                  * we fua the first super.  The others we allow
                  * to go down lazy.
                  */
-                ret = submit_bh(WRITE_FUA, bh);
+                ret = btrfsic_submit_bh(WRITE_FUA, bh);
                 if (ret)
                         errors++;
         }
@@ -2711,7 +2728,7 @@ static int write_dev_flush(struct btrfs_device *device, int wait)
         device->flush_bio = bio;
 
         bio_get(bio);
-        submit_bio(WRITE_FLUSH, bio);
+        btrfsic_submit_bio(WRITE_FLUSH, bio);
 
         return 0;
 }
@@ -3057,6 +3074,11 @@ int close_ctree(struct btrfs_root *root)
         btrfs_stop_workers(&fs_info->caching_workers);
         btrfs_stop_workers(&fs_info->readahead_workers);
 
+#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
+        if (btrfs_test_opt(root, CHECK_INTEGRITY))
+                btrfsic_unmount(root, fs_info->fs_devices);
+#endif
+
         btrfs_close_devices(fs_info->fs_devices);
         btrfs_mapping_tree_free(&fs_info->mapping_tree);
 
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 49f3c9dc09f..246669296e0 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;
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index ddf2c90d3fc..567e148caca 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
@@ -732,7 +733,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);
@@ -958,7 +959,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;
 }
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 34a8b6112ea..22a2015f1d7 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -165,7 +165,10 @@ enum {
         Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,
         Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,
         Opt_enospc_debug, Opt_subvolrootid, Opt_defrag,
-        Opt_inode_cache, Opt_no_space_cache, Opt_recovery, Opt_err,
+        Opt_inode_cache, Opt_no_space_cache, Opt_recovery,
+        Opt_check_integrity, Opt_check_integrity_including_extent_data,
+        Opt_check_integrity_print_mask,
+        Opt_err,
 };
 
 static match_table_t tokens = {
@@ -200,6 +203,9 @@ static match_table_t tokens = {
         {Opt_inode_cache, "inode_cache"},
         {Opt_no_space_cache, "nospace_cache"},
         {Opt_recovery, "recovery"},
+        {Opt_check_integrity, "check_int"},
+        {Opt_check_integrity_including_extent_data, "check_int_data"},
+        {Opt_check_integrity_print_mask, "check_int_print_mask=%d"},
         {Opt_err, NULL},
 };
 
@@ -398,6 +404,37 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
                         printk(KERN_INFO "btrfs: enabling auto recovery");
                         btrfs_set_opt(info->mount_opt, RECOVERY);
                         break;
+#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
+                case Opt_check_integrity_including_extent_data:
+                        printk(KERN_INFO "btrfs: enabling check integrity"
+                               " including extent data\n");
+                        btrfs_set_opt(info->mount_opt,
+                                      CHECK_INTEGRITY_INCLUDING_EXTENT_DATA);
+                        btrfs_set_opt(info->mount_opt, CHECK_INTEGRITY);
+                        break;
+                case Opt_check_integrity:
+                        printk(KERN_INFO "btrfs: enabling check integrity\n");
+                        btrfs_set_opt(info->mount_opt, CHECK_INTEGRITY);
+                        break;
+                case Opt_check_integrity_print_mask:
+                        intarg = 0;
+                        match_int(&args[0], &intarg);
+                        if (intarg) {
+                                info->check_integrity_print_mask = intarg;
+                                printk(KERN_INFO "btrfs:"
+                                       " check_integrity_print_mask 0x%x\n",
+                                       info->check_integrity_print_mask);
+                        }
+                        break;
+#else
+                case Opt_check_integrity_including_extent_data:
+                case Opt_check_integrity:
+                case Opt_check_integrity_print_mask:
+                        printk(KERN_ERR "btrfs: support for check_integrity*"
+                               " not compiled in!\n");
+                        ret = -EINVAL;
+                        goto out;
+#endif
                 case Opt_err:
                         printk(KERN_INFO "btrfs: unrecognized mount option "
                                "'%s'\n", p);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f4b839fd3c9..821334f6e3a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -32,6 +32,7 @@
 #include "print-tree.h"
 #include "volumes.h"
 #include "async-thread.h"
+#include "check-integrity.h"
 
 static int init_first_rw_device(struct btrfs_trans_handle *trans,
                                 struct btrfs_root *root,
@@ -246,7 +247,7 @@ loop_lock:
                         sync_pending = 0;
                 }
 
-                submit_bio(cur->bi_rw, cur);
+                btrfsic_submit_bio(cur->bi_rw, cur);
                 num_run++;
                 batch_run++;
                 if (need_resched())
@@ -3304,7 +3305,7 @@ static noinline int schedule_bio(struct btrfs_root *root,
         /* don't bother with additional async steps for reads, right now */
         if (!(rw & REQ_WRITE)) {
                 bio_get(bio);
-                submit_bio(rw, bio);
+                btrfsic_submit_bio(rw, bio);
                 bio_put(bio);
                 return 0;
         }
@@ -3399,7 +3400,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio,
                         if (async_submit)
                                 schedule_bio(root, dev, rw, bio);
                         else
-                                submit_bio(rw, bio);
+                                btrfsic_submit_bio(rw, bio);
                 } else {
                         bio->bi_bdev = root->fs_info->fs_devices->latest_bdev;
                         bio->bi_sector = logical >> 9;