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

Commit 87092698 authored by un'ichi Nomura's avatar un'ichi Nomura Committed by Jens Axboe
Browse files

block: Add gfp_mask parameter to bio_integrity_clone() 



Stricter gfp_mask might be required for clone allocation.
For example, request-based dm may clone bio in interrupt context
so it has to use GFP_ATOMIC.

Signed-off-by: default avatarKiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Cc: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 041b6237

fs/bio-integrity.c

+3 −2
Original line number Diff line number Diff line
@@ -685,19 +685,20 @@ EXPORT_SYMBOL(bio_integrity_split); 
 * bio_integrity_clone - Callback for cloning bios with integrity metadata

 * @bio:	New bio

 * @bio_src:	Original bio

 * @gfp_mask:	Memory allocation mask

 * @bs:		bio_set to allocate bip from

 *

 * Description:	Called to allocate a bip when cloning a bio

 */

int bio_integrity_clone(struct bio *bio, struct bio *bio_src,

			struct bio_set *bs)

			gfp_t gfp_mask, struct bio_set *bs)

{

	struct bio_integrity_payload *bip_src = bio_src->bi_integrity;

	struct bio_integrity_payload *bip;



	BUG_ON(bip_src == NULL);



	bip = bio_integrity_alloc_bioset(bio, GFP_NOIO, bip_src->bip_vcnt, bs);

	bip = bio_integrity_alloc_bioset(bio, gfp_mask, bip_src->bip_vcnt, bs);



	if (bip == NULL)

		return -EIO;

fs/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ struct bio *bio_clone(struct bio *bio, gfp_t gfp_mask) 
	if (bio_integrity(bio)) {

		int ret;



		ret = bio_integrity_clone(b, bio, fs_bio_set);

		ret = bio_integrity_clone(b, bio, gfp_mask, fs_bio_set);



		if (ret < 0)

			return NULL;

include/linux/bio.h

+2 −2
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ extern void bio_integrity_endio(struct bio *, int); 
extern void bio_integrity_advance(struct bio *, unsigned int);

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

extern void bio_integrity_split(struct bio *, struct bio_pair *, int);

extern int bio_integrity_clone(struct bio *, struct bio *, struct bio_set *);

extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t, struct bio_set *);

extern int bioset_integrity_create(struct bio_set *, int);

extern void bioset_integrity_free(struct bio_set *);

extern void bio_integrity_init_slab(void);
@@ -542,7 +542,7 @@ extern void bio_integrity_init_slab(void); 
#define bioset_integrity_create(a, b)	(0)

#define bio_integrity_prep(a)		(0)

#define bio_integrity_enabled(a)	(0)

#define bio_integrity_clone(a, b, c)	(0)

#define bio_integrity_clone(a, b, c,d )	(0)

#define bioset_integrity_free(a)	do { } while (0)

#define bio_integrity_free(a, b)	do { } while (0)

#define bio_integrity_endio(a, b)	do { } while (0)