block: Require subsystems to explicitly allocate bio_set integrity mempool

MD and DM create a new bio_set for every metadevice. Each bio_set has an
integrity mempool attached regardless of whether the metadevice is
capable of passing integrity metadata. This is a waste of memory.

Instead we defer the allocation decision to MD and DM since we know at
metadevice creation time whether integrity passthrough is needed or not.

Automatic integrity mempool allocation can then be removed from
bioset_create() and we make an explicit integrity allocation for the
fs_bio_set.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Acked-by: Mike Snitzer <snizer@redhat.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 86ba66c0b28a..1876761f1828 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1803,8 +1803,12 @@ int md_integrity_register(mddev_t *mddev)
                         mdname(mddev));
                 return -EINVAL;
         }
-        printk(KERN_NOTICE "md: data integrity on %s enabled\n",
-                mdname(mddev));
+        printk(KERN_NOTICE "md: data integrity enabled on %s\n", mdname(mddev));
+        if (bioset_integrity_create(mddev->bio_set, BIO_POOL_SIZE)) {
+                printk(KERN_ERR "md: failed to create integrity pool for %s\n",
+                       mdname(mddev));
+                return -EINVAL;
+        }
         return 0;
 }
 EXPORT_SYMBOL(md_integrity_register);