btrfs: remove btrfsic_submit_bh()

Now that the last use of btrfsic_submit_bh() is gone as the super block
is now written using bios, remove the function as well.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index a0ce69f..e750798 100644 (file)
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -2730,63 +2730,6 @@ static struct btrfsic_dev_state *btrfsic_dev_state_lookup(dev_t dev)
                                                  &btrfsic_dev_state_hashtable);
 }
 
-int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh)
-{
-       struct btrfsic_dev_state *dev_state;
-
-       if (!btrfsic_is_initialized)
-               return submit_bh(op, op_flags, bh);
-
-       mutex_lock(&btrfsic_mutex);
-       /* since btrfsic_submit_bh() might also be called before
-        * btrfsic_mount(), this might return NULL */
-       dev_state = btrfsic_dev_state_lookup(bh->b_bdev->bd_dev);
-
-       /* Only called to write the superblock (incl. FLUSH/FUA) */
-       if (NULL != dev_state &&
-           (op == REQ_OP_WRITE) && bh->b_size > 0) {
-               u64 dev_bytenr;
-
-               dev_bytenr = BTRFS_BDEV_BLOCKSIZE * bh->b_blocknr;
-               if (dev_state->state->print_mask &
-                   BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)
-                       pr_info("submit_bh(op=0x%x,0x%x, blocknr=%llu (bytenr %llu), size=%zu, data=%p, bdev=%p)\n",
-                              op, op_flags, (unsigned long long)bh->b_blocknr,
-                              dev_bytenr, bh->b_size, bh->b_data, bh->b_bdev);
-               btrfsic_process_written_block(dev_state, dev_bytenr,
-                                             &bh->b_data, 1, NULL,
-                                             NULL, bh, op_flags);
-       } else if (NULL != dev_state && (op_flags & REQ_PREFLUSH)) {
-               if (dev_state->state->print_mask &
-                   BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)
-                       pr_info("submit_bh(op=0x%x,0x%x FLUSH, bdev=%p)\n",
-                              op, op_flags, bh->b_bdev);
-               if (!dev_state->dummy_block_for_bio_bh_flush.is_iodone) {
-                       if ((dev_state->state->print_mask &
-                            (BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH |
-                             BTRFSIC_PRINT_MASK_VERBOSE)))
-                               pr_info("btrfsic_submit_bh(%s) with FLUSH but dummy block already in use (ignored)!\n",
-                                      dev_state->name);
-               } else {
-                       struct btrfsic_block *const block =
-                               &dev_state->dummy_block_for_bio_bh_flush;
-
-                       block->is_iodone = 0;
-                       block->never_written = 0;
-                       block->iodone_w_error = 0;
-                       block->flush_gen = dev_state->last_flush_gen + 1;
-                       block->submit_bio_bh_rw = op_flags;
-                       block->orig_bio_bh_private = bh->b_private;
-                       block->orig_bio_bh_end_io.bh = bh->b_end_io;
-                       block->next_in_same_bio = NULL;
-                       bh->b_private = block;
-                       bh->b_end_io = btrfsic_bh_end_io;
-               }
-       }
-       mutex_unlock(&btrfsic_mutex);
-       return submit_bh(op, op_flags, bh);
-}
-
 static void __btrfsic_submit_bio(struct bio *bio)
 {
        struct btrfsic_dev_state *dev_state;

diff --git a/fs/btrfs/check-integrity.h b/fs/btrfs/check-integrity.h
index 9bf4359..bcc730a 100644 (file)
--- a/fs/btrfs/check-integrity.h
+++ b/fs/btrfs/check-integrity.h
@@ -7,11 +7,9 @@
 #define BTRFS_CHECK_INTEGRITY_H
 
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
-int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh);
 void btrfsic_submit_bio(struct bio *bio);
 int btrfsic_submit_bio_wait(struct bio *bio);
 #else
-#define btrfsic_submit_bh submit_bh
 #define btrfsic_submit_bio submit_bio
 #define btrfsic_submit_bio_wait submit_bio_wait
 #endif