btrfs: remove unused member btrfs_root::name

[sfrench/cifs-2.6.git] / fs / btrfs / disk-io.c

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index d82df15af89c3d15aa693a462f32009d3a6de139..3830867e0225a0361b01e40229df01eaf12c433c 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -108,7 +108,6 @@ struct async_submit_bio {
        void *private_data;
        struct bio *bio;
        extent_submit_bio_start_t *submit_bio_start;
-       extent_submit_bio_done_t *submit_bio_done;
        int mirror_num;
        /*
         * bio_offset is optional, can be used if the pages in the bio
@@ -775,7 +774,7 @@ static void run_one_async_done(struct btrfs_work *work)
                return;
        }
 
-       async->submit_bio_done(async->private_data, async->bio, async->mirror_num);
+       btrfs_submit_bio_done(async->private_data, async->bio, async->mirror_num);
 }
 
 static void run_one_async_free(struct btrfs_work *work)
@@ -789,8 +788,7 @@ static void run_one_async_free(struct btrfs_work *work)
 blk_status_t btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct bio *bio,
                                 int mirror_num, unsigned long bio_flags,
                                 u64 bio_offset, void *private_data,
-                                extent_submit_bio_start_t *submit_bio_start,
-                                extent_submit_bio_done_t *submit_bio_done)
+                                extent_submit_bio_start_t *submit_bio_start)
 {
        struct async_submit_bio *async;
 
@@ -802,7 +800,6 @@ blk_status_t btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct bio *bio,
        async->bio = bio;
        async->mirror_num = mirror_num;
        async->submit_bio_start = submit_bio_start;
-       async->submit_bio_done = submit_bio_done;
 
        btrfs_init_work(&async->work, btrfs_worker_helper, run_one_async_start,
                        run_one_async_done, run_one_async_free);
@@ -845,24 +842,6 @@ static blk_status_t btree_submit_bio_start(void *private_data, struct bio *bio,
        return btree_csum_one_bio(bio);
 }
 
-static blk_status_t btree_submit_bio_done(void *private_data, struct bio *bio,
-                                           int mirror_num)
-{
-       struct inode *inode = private_data;
-       blk_status_t ret;
-
-       /*
-        * when we're called for a write, we're already in the async
-        * submission context.  Just jump into btrfs_map_bio
-        */
-       ret = btrfs_map_bio(btrfs_sb(inode->i_sb), bio, mirror_num, 1);
-       if (ret) {
-               bio->bi_status = ret;
-               bio_endio(bio);
-       }
-       return ret;
-}
-
 static int check_async_write(struct btrfs_inode *bi)
 {
        if (atomic_read(&bi->sync_writers))
@@ -905,8 +884,7 @@ static blk_status_t btree_submit_bio_hook(void *private_data, struct bio *bio,
                 */
                ret = btrfs_wq_submit_bio(fs_info, bio, mirror_num, 0,
                                          bio_offset, private_data,
-                                         btree_submit_bio_start,
-                                         btree_submit_bio_done);
+                                         btree_submit_bio_start);
        }
 
        if (ret)
@@ -1176,7 +1154,6 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info,
        root->highest_objectid = 0;
        root->nr_delalloc_inodes = 0;
        root->nr_ordered_extents = 0;
-       root->name = NULL;
        root->inode_tree = RB_ROOT;
        INIT_RADIX_TREE(&root->delayed_nodes_tree, GFP_ATOMIC);
        root->block_rsv = NULL;
@@ -3871,7 +3848,6 @@ static void free_fs_root(struct btrfs_root *root)
        free_extent_buffer(root->commit_root);
        kfree(root->free_ino_ctl);
        kfree(root->free_ino_pinned);
-       kfree(root->name);
        btrfs_put_fs_root(root);
 }
 
@@ -4545,21 +4521,11 @@ static int btrfs_cleanup_transaction(struct btrfs_fs_info *fs_info)
        return 0;
 }
 
-static struct btrfs_fs_info *btree_fs_info(void *private_data)
-{
-       struct inode *inode = private_data;
-       return btrfs_sb(inode->i_sb);
-}
-
 static const struct extent_io_ops btree_extent_io_ops = {
        /* mandatory callbacks */
        .submit_bio_hook = btree_submit_bio_hook,
        .readpage_end_io_hook = btree_readpage_end_io_hook,
-       /* note we're sharing with inode.c for the merge bio hook */
-       .merge_bio_hook = btrfs_merge_bio_hook,
        .readpage_io_failed_hook = btree_io_failed_hook,
-       .set_range_writeback = btrfs_set_range_writeback,
-       .tree_fs_info = btree_fs_info,
 
        /* optional callbacks */
 };