btrfs: Remove extent_io_ops::merge_extent_hook callback

[sfrench/cifs-2.6.git] / fs / btrfs / extent_io.h

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 369daa5d4f73d618a3aadf9793bc0bc2cc84c585..7d181a378d90fe0089ecfa3c2d5f1a023c23a423 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -106,26 +106,8 @@ struct extent_io_ops {
        /*
         * Optional hooks, called if the pointer is not NULL
         */
-       int (*fill_delalloc)(void *private_data, struct page *locked_page,
-                            u64 start, u64 end, int *page_started,
-                            unsigned long *nr_written,
-                            struct writeback_control *wbc);
-
-       int (*writepage_start_hook)(struct page *page, u64 start, u64 end);
-       void (*writepage_end_io_hook)(struct page *page, u64 start, u64 end,
-                                     struct extent_state *state, int uptodate);
-       void (*set_bit_hook)(void *private_data, struct extent_state *state,
-                            unsigned *bits);
-       void (*clear_bit_hook)(void *private_data,
-                       struct extent_state *state,
-                       unsigned *bits);
-       void (*merge_extent_hook)(void *private_data,
-                                 struct extent_state *new,
-                                 struct extent_state *other);
        void (*split_extent_hook)(void *private_data,
                                  struct extent_state *orig, u64 split);
-       void (*check_extent_io_range)(void *private_data, const char *caller,
-                                     u64 start, u64 end);
 };
 
 struct extent_io_tree {