diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 15:41:24 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 15:41:24 -0400 |
| commit | 0510d599d2f72de274938a573e4f69d2d3162d4a (patch) | |
| tree | 987ef2ad96068c570e52a5f9aba27473c9ce7859 | |
| parent | 770bfb499dc424d7b48660cb7139248955098d3c (diff) | |
| download | longterm-queue-4.12-0510d599d2f72de274938a573e4f69d2d3162d4a.tar.gz | |
bcache: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/bcache-fix-wrong-cache_misses-statistics.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/bcache-fix-wrong-cache_misses-statistics.patch b/queue/bcache-fix-wrong-cache_misses-statistics.patch index a791146..f0acf66 100644 --- a/queue/bcache-fix-wrong-cache_misses-statistics.patch +++ b/queue/bcache-fix-wrong-cache_misses-statistics.patch @@ -1,4 +1,4 @@ -From c157313791a999646901b3e3c6888514ebc36d62 Mon Sep 17 00:00:00 2001 +From 5ac03ca76feb7071d0680032f92067a48fe6e7d9 Mon Sep 17 00:00:00 2001 From: "tang.junhui" <tang.junhui@zte.com.cn> Date: Mon, 30 Oct 2017 14:46:34 -0700 Subject: [PATCH] bcache: fix wrong cache_misses statistics @@ -18,12 +18,13 @@ Signed-off-by: tang.junhui <tang.junhui@zte.com.cn> Reviewed-by: Michael Lyle <mlyle@lyle.org> Reviewed-by: Coly Li <colyli@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c -index 886e4b6643f1..597dd1e87bea 100644 +index a1000be1493d..8f04bf540794 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c -@@ -470,6 +470,7 @@ struct search { +@@ -462,6 +462,7 @@ struct search { unsigned recoverable:1; unsigned write:1; unsigned read_dirty_data:1; @@ -31,7 +32,7 @@ index 886e4b6643f1..597dd1e87bea 100644 unsigned long start_time; -@@ -656,6 +657,7 @@ static inline struct search *search_alloc(struct bio *bio, +@@ -647,6 +648,7 @@ static inline struct search *search_alloc(struct bio *bio, s->orig_bio = bio; s->cache_miss = NULL; @@ -39,7 +40,7 @@ index 886e4b6643f1..597dd1e87bea 100644 s->d = d; s->recoverable = 1; s->write = op_is_write(bio_op(bio)); -@@ -775,7 +777,7 @@ static void cached_dev_read_done_bh(struct closure *cl) +@@ -765,7 +767,7 @@ static void cached_dev_read_done_bh(struct closure *cl) struct cached_dev *dc = container_of(s->d, struct cached_dev, disk); bch_mark_cache_accounting(s->iop.c, s->d, @@ -47,8 +48,8 @@ index 886e4b6643f1..597dd1e87bea 100644 + !s->cache_missed, s->iop.bypass); trace_bcache_read(s->orig_bio, !s->cache_miss, s->iop.bypass); - if (s->iop.status) -@@ -794,6 +796,8 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, + if (s->iop.error) +@@ -784,6 +786,8 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, struct cached_dev *dc = container_of(s->d, struct cached_dev, disk); struct bio *miss, *cache_bio; |