Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32231638 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Jens Axboe
Browse files

block: Allow empty integrity profile 



Allow a block device to allocate and register an integrity profile
without providing a template.  This allows DM to preallocate a profile
to avoid deadlocks during table reconfiguration.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 8ae372e3

block/blk-integrity.c

+14 −11
Original line number Diff line number Diff line
@@ -309,20 +309,20 @@ static struct kobj_type integrity_ktype = { 
/**

 * blk_integrity_register - Register a gendisk as being integrity-capable

 * @disk:	struct gendisk pointer to make integrity-aware

 * @template:	integrity profile

 * @template:	optional integrity profile to register

 *

 * Description: When a device needs to advertise itself as being able

 * to send/receive integrity metadata it must use this function to

 * register the capability with the block layer.  The template is a

 * blk_integrity struct with values appropriate for the underlying

 * hardware.  See Documentation/block/data-integrity.txt.

 * hardware.  If template is NULL the new profile is allocated but

 * not filled out. See Documentation/block/data-integrity.txt.

 */

int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)

{

	struct blk_integrity *bi;



	BUG_ON(disk == NULL);

	BUG_ON(template == NULL);



	if (disk->integrity == NULL) {

		bi = kmem_cache_alloc(integrity_cachep,
@@ -346,6 +346,7 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template) 
		bi = disk->integrity;



	/* Use the provided profile as template */

	if (template != NULL) {

		bi->name = template->name;

		bi->generate_fn = template->generate_fn;

		bi->verify_fn = template->verify_fn;
@@ -353,6 +354,8 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template) 
		bi->set_tag_fn = template->set_tag_fn;

		bi->get_tag_fn = template->get_tag_fn;

		bi->tag_size = template->tag_size;

	} else

		bi->name = "unsupported";



	return 0;

}