euleros/rtos inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4LOJ6 CVE: NA -------------------------------- This patch set introduce many conflicts while backporting mainline bcache patches, revert it temporarily. This reverts commit 1751c6ad813499c5f5cd2e0c36c27329b8203366. Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> --- drivers/md/bcache/request.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 04a779573fdd..fd381da32464 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -993,11 +993,8 @@ static void cached_dev_write_complete(struct closure *cl) struct search *s = container_of(cl, struct search, cl); struct cached_dev *dc = container_of(s->d, struct cached_dev, disk); - if (!s->iop.bypass) - closure_call(&s->iop.cl, bch_data_insert, NULL, cl); - up_read_non_owner(&dc->writeback_lock); - continue_at(cl, cached_dev_bio_complete, NULL); + cached_dev_bio_complete(cl); } static void cached_dev_write(struct cached_dev *dc, struct search *s) @@ -1080,8 +1077,7 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s) } insert_data: - if (!s->iop.bypass) - closure_call(&s->iop.cl, bch_data_insert, NULL, cl); + closure_call(&s->iop.cl, bch_data_insert, NULL, cl); continue_at(cl, cached_dev_write_complete, NULL); } -- 2.20.1