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 a3a3302f3625936af4e35e07922d3e066ba2cff1..7d181a378d90fe0089ecfa3c2d5f1a023c23a423 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -106,9 +106,6 @@ struct extent_io_ops {
        /*
         * Optional hooks, called if the pointer is not NULL
         */
        /*
         * Optional hooks, called if the pointer is not NULL
         */

-       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 (*split_extent_hook)(void *private_data,
                                  struct extent_state *orig, u64 split);
 };