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

Commit bd1c1c21 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: REQ_NOMERGE is common to the bio and request 



So move it into the common setion of the request flags.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarShaun Tancheff <shaun.tancheff@seagate.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent c4aebd03

include/linux/blk_types.h

+1 −1
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ enum rq_flag_bits { 
	__REQ_META,		/* metadata io request */

	__REQ_PRIO,		/* boost priority in cfq */



	__REQ_NOMERGE,		/* don't touch this for merging */

	__REQ_NOIDLE,		/* don't anticipate more IO after this one */

	__REQ_INTEGRITY,	/* I/O includes block integrity payload */

	__REQ_FUA,		/* forced unit access */
@@ -171,7 +172,6 @@ enum rq_flag_bits { 
	/* request only flags */

	__REQ_SORTED,		/* elevator knows about this request */

	__REQ_SOFTBARRIER,	/* may not be passed by ioscheduler */

	__REQ_NOMERGE,		/* don't touch this for merging */

	__REQ_STARTED,		/* drive already may have started this one */

	__REQ_DONTPREP,		/* don't call prep for this one */

	__REQ_QUEUED,		/* uses queueing */