Commit 63816725 authored by Li Lingfeng's avatar Li Lingfeng Committed by Li Nan
Browse files

block: fix kabi broken 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB7FJU



--------------------------------

Commit 0f2e6ab8 ("block: turn the nr_iovecs argument to bio_alloc*
into an unsigned short") change the type of parameter of bio_alloc_bioset.
Change it back to fix kabi broken since it does't matter.

Fixes: 0f2e6ab8 ("block: turn the nr_iovecs argument to bio_alloc* into an unsigned short")
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parent d2f334ca

block/bio.c

+2 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static void punt_bios_to_rescuer(struct bio_set *bs) 
 *   RETURNS:

 *   Pointer to new bio on success, NULL on failure.

 */

struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned short nr_iovecs,

struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs_int,

			     struct bio_set *bs)

{

	gfp_t saved_gfp = gfp_mask;
@@ -416,6 +416,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned short nr_iovecs, 
	struct bio_vec *bvl = NULL;

	struct bio *bio;

	void *p;

	unsigned short nr_iovecs = (unsigned short)nr_iovecs_int;



	if (!bs) {

		if (nr_iovecs > UIO_MAXIOV)

include/linux/bio.h

+3 −3
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ extern void bioset_exit(struct bio_set *); 
extern int biovec_init_pool(mempool_t *pool, int pool_entries);

extern int bioset_init_from_src(struct bio_set *bs, struct bio_set *src);



extern struct bio *bio_alloc_bioset(gfp_t, unsigned short, struct bio_set *);

extern struct bio *bio_alloc_bioset(gfp_t, unsigned int, struct bio_set *);

extern void bio_put(struct bio *);



extern void __bio_clone_fast(struct bio *, struct bio *);
@@ -401,12 +401,12 @@ extern struct bio *bio_clone_fast(struct bio *, gfp_t, struct bio_set *); 


extern struct bio_set fs_bio_set;



static inline struct bio *bio_alloc(gfp_t gfp_mask, unsigned short nr_iovecs)

static inline struct bio *bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs)

{

	return bio_alloc_bioset(gfp_mask, nr_iovecs, &fs_bio_set);

}



static inline struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned short nr_iovecs)

static inline struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned int nr_iovecs)

{

	return bio_alloc_bioset(gfp_mask, nr_iovecs, NULL);

}