Skip to content

Commit 21671a1

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: also return bio_integrity_payload * from stubs
struct bio_integrity_payload is defined unconditionally. No need to return void * from bio_integrity() and bio_integrity_alloc(). Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Kanchan Joshi <[email protected]> Reviewed-by: Anuj Gupta <[email protected]> Reviewed-by: Johannes Thumshirn <[email protected]> Reviewed-by: Martin K. Petersen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent da042a3 commit 21671a1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

include/linux/bio-integrity.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void bio_integrity_init(void);
8585

8686
#else /* CONFIG_BLK_DEV_INTEGRITY */
8787

88-
static inline void *bio_integrity(struct bio *bio)
88+
static inline struct bio_integrity_payload *bio_integrity(struct bio *bio)
8989
{
9090
return NULL;
9191
}
@@ -138,8 +138,8 @@ static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)
138138
return false;
139139
}
140140

141-
static inline void *bio_integrity_alloc(struct bio *bio, gfp_t gfp,
142-
unsigned int nr)
141+
static inline struct bio_integrity_payload *
142+
bio_integrity_alloc(struct bio *bio, gfp_t gfp, unsigned int nr)
143143
{
144144
return ERR_PTR(-EINVAL);
145145
}

0 commit comments

Comments
 (0)