On Thu, Oct 20, 2016 at 8:12 AM, Christoph Hellwig <hch@xxxxxx> wrote: > So move it into the common setion of the request flags. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > include/linux/blk_types.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h > index dd50dce..b541425 100644 > --- a/include/linux/blk_types.h > +++ b/include/linux/blk_types.h > @@ -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 */ > -- > 2.1.4 Reviewed-by: Shaun Tancheff <shaun.tancheff@xxxxxxxxxxx> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-block" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at https://urldefense.proofpoint.com/v2/url?u=http-3A__vger.kernel.org_majordomo-2Dinfo.html&d=DQIBAg&c=IGDlg0lD0b-nebmJJ0Kp8A&r=Wg5NqlNlVTT7Ugl8V50qIHLe856QW0qfG3WVYGOrWzA&m=q_Oospel-PGSwDEAUGlzDQKL9S8YlBIfehABhGO_-i8&s=YnVt18OmOH55cgUr9hWUzTYYHA9-aswseNFXjDdzrkg&e= -- Shaun Tancheff -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html