diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-09-05 11:09:17 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-09-05 11:09:17 -0400 |
| commit | aec81c1895a3a300c01dd6219b54dce6b8486bf3 (patch) | |
| tree | 56e1ef575ce54290db15db8361a534f56dfe0bf9 /drivers/block | |
| parent | 19aa953533e6ee9789ab0548851d5d663b7499fb (diff) | |
| parent | 4b904b22bc906d5867933b8132ae4d7f31d7645d (diff) | |
Merge tag 'v4.9.45' into v4.9-rt
This is the 4.9.45 stable release
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/xen-blkfront.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 9908597c5209..f11d62de2272 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -2112,9 +2112,9 @@ static int blkfront_resume(struct xenbus_device *dev) /* * Get the bios in the request so we can re-queue them. */ - if (req_op(shadow[i].request) == REQ_OP_FLUSH || - req_op(shadow[i].request) == REQ_OP_DISCARD || - req_op(shadow[i].request) == REQ_OP_SECURE_ERASE || + 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) { /* * Flush operations don't contain bios, so |