1 files changed, 9 insertions, 1 deletions

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index c09a40db53db..22bda32acb89 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -145,8 +145,16 @@ int __init extent_io_init(void)
                                      offsetof(struct btrfs_io_bio, bio));
         if (!btrfs_bioset)
                 goto free_buffer_cache;
+
+        if (bioset_integrity_create(btrfs_bioset, BIO_POOL_SIZE))
+                goto free_bioset;
+
         return 0;
 
+free_bioset:
+        bioset_free(btrfs_bioset);
+        btrfs_bioset = NULL;
+
 free_buffer_cache:
         kmem_cache_destroy(extent_buffer_cache);
         extent_buffer_cache = NULL;
@@ -1614,7 +1622,7 @@ again:
                 *start = delalloc_start;
                 *end = delalloc_end;
                 free_extent_state(cached_state);
-                return found;
+                return 0;
         }
 
         /*