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

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

block: Get rid of bdev_integrity_enabled() 



bdev_integrity_enabled() is only used by bio_integrity_enabled().
Combine these two functions.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f70ced09

Documentation/block/data-integrity.txt

+0 −10
Original line number Diff line number Diff line
@@ -192,16 +192,6 @@ will require extra work due to the application tag. 
    supported by the block device.





    int bdev_integrity_enabled(block_device, int rw);



      bdev_integrity_enabled() will return 1 if the block device

      supports integrity metadata transfer for the data direction

      specified in 'rw'.



      bdev_integrity_enabled() honors the write_generate and

      read_verify flags in sysfs and will respond accordingly.





    int bio_integrity_prep(bio);



      To generate IMD for WRITE and to set up buffers for READ, the

block/bio-integrity.c

+17 −22
Original line number Diff line number Diff line
@@ -147,24 +147,6 @@ int bio_integrity_add_page(struct bio *bio, struct page *page, 
}

EXPORT_SYMBOL(bio_integrity_add_page);



static int bdev_integrity_enabled(struct block_device *bdev, int rw)

{

	struct blk_integrity *bi = bdev_get_integrity(bdev);



	if (bi == NULL)

		return 0;



	if (rw == READ && bi->verify_fn != NULL &&

	    (bi->flags & INTEGRITY_FLAG_READ))

		return 1;



	if (rw == WRITE && bi->generate_fn != NULL &&

	    (bi->flags & INTEGRITY_FLAG_WRITE))

		return 1;



	return 0;

}



/**

 * bio_integrity_enabled - Check whether integrity can be passed

 * @bio:	bio to check
@@ -174,16 +156,29 @@ static int bdev_integrity_enabled(struct block_device *bdev, int rw) 
 * set prior to calling.  The functions honors the write_generate and

 * read_verify flags in sysfs.

 */

int bio_integrity_enabled(struct bio *bio)

bool bio_integrity_enabled(struct bio *bio)

{

	struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);



	if (!bio_is_rw(bio))

		return 0;

		return false;



	/* Already protected? */

	if (bio_integrity(bio))

		return 0;

		return false;



	if (bi == NULL)

		return false;



	if (bio_data_dir(bio) == READ && bi->verify_fn != NULL &&

	    (bi->flags & INTEGRITY_FLAG_READ))

		return true;



	if (bio_data_dir(bio) == WRITE && bi->generate_fn != NULL &&

	    (bi->flags & INTEGRITY_FLAG_WRITE))

		return true;



	return bdev_integrity_enabled(bio->bi_bdev, bio_data_dir(bio));

	return false;

}

EXPORT_SYMBOL(bio_integrity_enabled);

include/linux/bio.h

+3 −3
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ struct biovec_slab { 
extern struct bio_integrity_payload *bio_integrity_alloc(struct bio *, gfp_t, unsigned int);

extern void bio_integrity_free(struct bio *);

extern int bio_integrity_add_page(struct bio *, struct page *, unsigned int, unsigned int);

extern int bio_integrity_enabled(struct bio *bio);

extern bool bio_integrity_enabled(struct bio *bio);

extern int bio_integrity_set_tag(struct bio *, void *, unsigned int);

extern int bio_integrity_get_tag(struct bio *, void *, unsigned int);

extern int bio_integrity_prep(struct bio *);
@@ -685,9 +685,9 @@ static inline int bio_integrity(struct bio *bio) 
	return 0;

}



static inline int bio_integrity_enabled(struct bio *bio)

static inline bool bio_integrity_enabled(struct bio *bio)

{

	return 0;

	return false;

}



static inline int bioset_integrity_create(struct bio_set *bs, int pool_size)