diff options
| author |   Dave Airlie <airlied@redhat.com> | 2013-10-22 07:32:40 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-10-22 07:32:40 +0100 |
| commit | 3bcec5f076688c58436a6c354f5b94eef16469da (patch) | |
| tree | 6e50e1c03d52bffbd17b16dd6b153a428f0b9e7c /drivers/md/bcache/request.c | |
| parent | drm: Pad drm_mode_get_connector to 64-bit boundary (diff) | |
| parent | drm/i915: Disable GGTT PTEs on GEN6+ suspend (diff) | |
| download | wireguard-linux-3bcec5f076688c58436a6c354f5b94eef16469da.tar.xz wireguard-linux-3bcec5f076688c58436a6c354f5b94eef16469da.zip | |
Merge tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Just an lvds clock gating fix and a pte clearing hack for hsw to avoid
memory corruption when hibernating - something doesn't seem to switch off
properly, we're still investigating.
* tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel: (96 commits)
drm/i915: Disable GGTT PTEs on GEN6+ suspend
drm/i915: Make PTE valid encoding optional
drm/i915: disable LVDS clock gating on CPT v2
Diffstat (limited to 'drivers/md/bcache/request.c')
| -rw-r--r-- | drivers/md/bcache/request.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 71eb233b9ace..b6a74bcbb08f 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -996,6 +996,7 @@ static void request_write(struct cached_dev *dc, struct search *s) closure_bio_submit(bio, cl, s->d); } else { bch_writeback_add(dc); + s->op.cache_bio = bio; if (bio->bi_rw & REQ_FLUSH) { /* Also need to send a flush to the backing device */ @@ -1008,8 +1009,6 @@ static void request_write(struct cached_dev *dc, struct search *s) flush->bi_private = cl; closure_bio_submit(flush, cl, s->d); - } else { - s->op.cache_bio = bio; } } out: |