diff options
| author | Jens Axboe <axboe@fb.com> | 2014-08-05 11:02:05 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-08-05 11:02:05 -0600 |
| commit | 99d540018caa920b7a54e2d3048f1dff530b294b (patch) | |
| tree | c7dc58311c4626c57c2f54c81ed4ec00781c3a41 /drivers/md/bcache/request.c | |
| parent | bf0d6e4a1138e71cafdbbb99cde430eee50c4ff1 (diff) | |
| parent | 0781c8748cf1ea2b0dcd966571103909528c4efa (diff) | |
Merge branch 'for-jens' of http://evilpiepirate.org/git/linux-bcache into for-3.17/drivers
Kent writes:
Hey Jens, here's the pull request for 3.17 - typically late, but lots of
tasty fixes in this one.
Diffstat (limited to 'drivers/md/bcache/request.c')
| -rw-r--r-- | drivers/md/bcache/request.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 15fff4f68a7c..62e6e98186b5 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -311,7 +311,8 @@ void bch_data_insert(struct closure *cl) { struct data_insert_op *op = container_of(cl, struct data_insert_op, cl); - trace_bcache_write(op->bio, op->writeback, op->bypass); + trace_bcache_write(op->c, op->inode, op->bio, + op->writeback, op->bypass); bch_keylist_init(&op->insert_keys); bio_get(op->bio); |