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

Commit c74dbc53 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: Remove compiler built in function checks for bio_set_op_attrs"

parents 5df191b8 19afaa8c

include/linux/blk_types.h

+2 −8
Original line number Diff line number Diff line
@@ -109,13 +109,7 @@ struct bio { 
#define bio_op(bio)	((bio)->bi_opf >> BIO_OP_SHIFT)



#define bio_set_op_attrs(bio, op, op_flags) do {			\

	if (__builtin_constant_p(op))					\

		BUILD_BUG_ON((op) + 0U >= (1U << REQ_OP_BITS));		\

	else								\

	WARN_ON_ONCE((op) + 0U >= (1U << REQ_OP_BITS));			\

	if (__builtin_constant_p(op_flags))				\

		BUILD_BUG_ON((op_flags) + 0U >= (1U << BIO_OP_SHIFT));	\

	else								\

	WARN_ON_ONCE((op_flags) + 0U >= (1U << BIO_OP_SHIFT));		\

	(bio)->bi_opf = bio_flags(bio);					\

	(bio)->bi_opf |= (((op) + 0U) << BIO_OP_SHIFT);			\