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

[Stephen Rothwell]

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.

-- 
Cheers,
Stephen Rothwell