diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:05 -0500 |
| commit | ca89bc248e2fac44d6374a48b8d38b068c7a1bdf (patch) | |
| tree | 0c10af2a5f22a1ad0283023d403022ce6b84ebc4 /drivers/md/bcache/request.c | |
| parent | 9645083ca5ef365b7b750cf219bb20b61bb925f8 (diff) | |
| parent | 7b5bfb82882b9b1c8423ce0ed6852ca3762d967a (diff) | |
Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus
Diffstat (limited to 'drivers/md/bcache/request.c')
| -rw-r--r-- | drivers/md/bcache/request.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index b6a74bcbb08f..2a7f0dd6abab 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c | |||
| @@ -1000,7 +1000,7 @@ static void request_write(struct cached_dev *dc, struct search *s) | |||
| 1000 | 1000 | ||
| 1001 | if (bio->bi_rw & REQ_FLUSH) { | 1001 | if (bio->bi_rw & REQ_FLUSH) { |
| 1002 | /* Also need to send a flush to the backing device */ | 1002 | /* Also need to send a flush to the backing device */ |
| 1003 | struct bio *flush = bio_alloc_bioset(0, GFP_NOIO, | 1003 | struct bio *flush = bio_alloc_bioset(GFP_NOIO, 0, |
| 1004 | dc->disk.bio_split); | 1004 | dc->disk.bio_split); |
| 1005 | 1005 | ||
| 1006 | flush->bi_rw = WRITE_FLUSH; | 1006 | flush->bi_rw = WRITE_FLUSH; |