Re: linux-next: manual merge of the block tree with Linus' tree

From: Konrad Rzeszutek Wilk
Date: Fri Jul 08 2016 - 10:11:57 EST


On Fri, Jul 08, 2016 at 02:14:29PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 8 Jul 2016 13:07:50 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > + * Get the bios in the request so we can re-queue them.
> > + */
> > - if (shadow[j].request->cmd_flags &
> > - (REQ_FLUSH | REQ_FUA | REQ_DISCARD | REQ_SECURE)) {
> > ++ if (req_op(shadow[j].request) == REQ_OP_FLUSH ||
> > ++ req_op(shadow[j].request) == REQ_OP_DISCARD ||
> > ++ req_op(shadow[j].request) == REQ_OP_SECURE_ERASE ||
> > ++ shadow[j].request->cmd_flags & REQ_FUA)) {
> ^
> That is an extra ')' which I have now removed.

Stephen,

Thanks as always for doing this!
>
> --
> Cheers,
> Stephen Rothwell