for-next: move some patches into for-next/wip.

13 files changed, 0 insertions, 109 deletions

diff --git a/for-test/0001-bcache-add-member-io_disable-in-struct-cache_set.patch b/for-next/0001-bcache-add-member-io_disable-in-struct-cache_set.patch
index 5d4ed08..5d4ed08 100644
--- a/for-test/0001-bcache-add-member-io_disable-in-struct-cache_set.patch
+++ b/for-next/0001-bcache-add-member-io_disable-in-struct-cache_set.patch
diff --git a/for-test/0002-bcache-add-sysfs-interface-to-io_disable-of-struct-c.patch b/for-next/0002-bcache-add-sysfs-interface-to-io_disable-of-struct-c.patch
index f690d35..f690d35 100644
--- a/for-test/0002-bcache-add-sysfs-interface-to-io_disable-of-struct-c.patch
+++ b/for-next/0002-bcache-add-sysfs-interface-to-io_disable-of-struct-c.patch
diff --git a/for-test/0003-bcache-make-io_error_shift-configurable-via-sysfs-in.patch b/for-next/0003-bcache-make-io_error_shift-configurable-via-sysfs-in.patch
index b8bfa23..b8bfa23 100644
--- a/for-test/0003-bcache-make-io_error_shift-configurable-via-sysfs-in.patch
+++ b/for-next/0003-bcache-make-io_error_shift-configurable-via-sysfs-in.patch
diff --git a/for-test/0001-bcache-add-a-comment-in-register_bdev.patch b/for-next/wip/0001-bcache-add-a-comment-in-register_bdev.patch
index 2377298..2377298 100644
--- a/for-test/0001-bcache-add-a-comment-in-register_bdev.patch
+++ b/for-next/wip/0001-bcache-add-a-comment-in-register_bdev.patch
diff --git a/for-test/0001-bcache-fix-mistaken-code-comments-in-struct-cache.patch b/for-next/wip/0001-bcache-fix-mistaken-code-comments-in-struct-cache.patch
index 3e52bcc..3e52bcc 100644
--- a/for-test/0001-bcache-fix-mistaken-code-comments-in-struct-cache.patch
+++ b/for-next/wip/0001-bcache-fix-mistaken-code-comments-in-struct-cache.patch
diff --git a/for-test/0001-bcache-fix-mistaken-comments-in-bch_keylist_realloc.patch b/for-next/wip/0001-bcache-fix-mistaken-comments-in-bch_keylist_realloc.patch
index 9a23a70..9a23a70 100644
--- a/for-test/0001-bcache-fix-mistaken-comments-in-bch_keylist_realloc.patch
+++ b/for-next/wip/0001-bcache-fix-mistaken-comments-in-bch_keylist_realloc.patch
diff --git a/for-test/0001-bcache-set-task-state-correctly-in-allocator_wait.patch b/for-next/wip/0001-bcache-set-task-state-correctly-in-allocator_wait.patch
index dbc15c5..dbc15c5 100644
--- a/for-test/0001-bcache-set-task-state-correctly-in-allocator_wait.patch
+++ b/for-next/wip/0001-bcache-set-task-state-correctly-in-allocator_wait.patch
diff --git a/for-test/0005-bcache-add-backing_request_endio-for-bios-to-backing.patch b/for-next/wip/0005-bcache-add-backing_request_endio-for-bios-to-backing.patch
index 810a29a..810a29a 100644
--- a/for-test/0005-bcache-add-backing_request_endio-for-bios-to-backing.patch
+++ b/for-next/wip/0005-bcache-add-backing_request_endio-for-bios-to-backing.patch
diff --git a/for-test/0006-bcache-add-io_disable-to-struct-cached_dev.patch b/for-next/wip/0006-bcache-add-io_disable-to-struct-cached_dev.patch
index f2e4721..f2e4721 100644
--- a/for-test/0006-bcache-add-io_disable-to-struct-cached_dev.patch
+++ b/for-next/wip/0006-bcache-add-io_disable-to-struct-cached_dev.patch
diff --git a/for-test/0007-bcache-add-sysfs-interface-to-cached_dev-member-io_e.patch b/for-next/wip/0007-bcache-add-sysfs-interface-to-cached_dev-member-io_e.patch
index 3da6731..3da6731 100644
--- a/for-test/0007-bcache-add-sysfs-interface-to-cached_dev-member-io_e.patch
+++ b/for-next/wip/0007-bcache-add-sysfs-interface-to-cached_dev-member-io_e.patch
diff --git a/for-test/0008-bcache-disable-bcache-device-I-O-request-when-backin.patch b/for-next/wip/0008-bcache-disable-bcache-device-I-O-request-when-backin.patch
index c3b2fcb..c3b2fcb 100644
--- a/for-test/0008-bcache-disable-bcache-device-I-O-request-when-backin.patch
+++ b/for-next/wip/0008-bcache-disable-bcache-device-I-O-request-when-backin.patch
diff --git a/for-test/set-writeback_rate-to-0-when-no-writeback-running.patch b/for-next/wip/set-writeback_rate-to-0-when-no-writeback-running.patch
index 02c01fe..02c01fe 100644
--- a/for-test/set-writeback_rate-to-0-when-no-writeback-running.patch
+++ b/for-next/wip/set-writeback_rate-to-0-when-no-writeback-running.patch
diff --git a/for-test/0004-bcache-add-cache_bio-and-back_bio-to-struct-search.patch b/for-test/0004-bcache-add-cache_bio-and-back_bio-to-struct-search.patch
deleted file mode 100644
index 6be289e..0000000
--- a/for-test/0004-bcache-add-cache_bio-and-back_bio-to-struct-search.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 3040d3bdf9d8180d27fe1c5accbb528bbd745647 Mon Sep 17 00:00:00 2001
-From: Coly Li <colyli@suse.de>
-Date: Tue, 5 Dec 2017 15:50:44 +0800
-Subject: [PATCH] bcache: add cache_bio and back_bio to struct search
-
-member bio is renmaed to cache_bio for bio on cache device, add a new
-member back_bio for bio on backing device.
-
-XXX: in do_bio_hook(), not sure the following is safe or not yet:
-	bio_cnt_set(cache_bio, 3);
-
-Signed-off-by: Coly Li <colyli@suse.de>
----
- drivers/md/bcache/request.c | 28 +++++++++++++++-------------
- 1 file changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
-index 6570b5f443c9..55328d8cc6d2 100644
---- a/drivers/md/bcache/request.c
-+++ b/drivers/md/bcache/request.c
-@@ -462,7 +462,8 @@ struct search {
- 	/* Stack frame for bio_complete */
- 	struct closure		cl;
- 
--	struct bbio		bio;
-+	struct bbio		cache_bio;
-+	struct bbio		backing_bio;
- 	struct bio		*orig_bio;
- 	struct bio		*cache_miss;
- 	struct bcache_device	*d;
-@@ -510,7 +511,7 @@ static void bch_cache_read_endio(struct bio *bio)
- static int cache_lookup_fn(struct btree_op *op, struct btree *b, struct bkey *k)
- {
- 	struct search *s = container_of(op, struct search, op);
--	struct bio *n, *bio = &s->bio.bio;
-+	struct bio *n, *bio = &s->cache_bio.bio;
- 	struct bkey *bio_key;
- 	unsigned ptr;
- 
-@@ -575,7 +576,7 @@ static int cache_lookup_fn(struct btree_op *op, struct btree *b, struct bkey *k)
- static void cache_lookup(struct closure *cl)
- {
- 	struct search *s = container_of(cl, struct search, iop.cl);
--	struct bio *bio = &s->bio.bio;
-+	struct bio *bio = &s->cache_bio.bio;
- 	int ret;
- 
- 	bch_btree_op_init(&s->op, -1);
-@@ -624,14 +625,15 @@ static void bio_complete(struct search *s)
- 
- static void do_bio_hook(struct search *s, struct bio *orig_bio)
- {
--	struct bio *bio = &s->bio.bio;
-+	struct bio *cache_bio = &s->cache_bio.bio;
- 
--	bio_init(bio, NULL, 0);
--	__bio_clone_fast(bio, orig_bio);
--	bio->bi_end_io		= request_endio;
--	bio->bi_private		= &s->cl;
-+	bio_init(cache_bio, NULL, 0);
-+	__bio_clone_fast(cache_bio, orig_bio);
-+	cache_bio->bi_end_io		= request_endio;
-+	cache_bio->bi_private		= &s->cl;
- 
--	bio_cnt_set(bio, 3);
-+	/* coly: need to confirm */
-+	bio_cnt_set(cache_bio, 3);
- }
- 
- static void search_free(struct closure *cl)
-@@ -707,7 +709,7 @@ static void cached_dev_cache_miss_done(struct closure *cl)
- static void cached_dev_read_error(struct closure *cl)
- {
- 	struct search *s = container_of(cl, struct search, cl);
--	struct bio *bio = &s->bio.bio;
-+	struct bio *bio = &s->cache_bio.bio;
- 	struct cached_dev *dc = container_of(s->d, struct cached_dev, disk);
- 
- 	/*
-@@ -885,7 +887,7 @@ static void cached_dev_write_complete(struct closure *cl)
- static void cached_dev_write(struct cached_dev *dc, struct search *s)
- {
- 	struct closure *cl = &s->cl;
--	struct bio *bio = &s->bio.bio;
-+	struct bio *bio = &s->cache_bio.bio;
- 	struct bkey start = KEY(dc->disk.id, bio->bi_iter.bi_sector, 0);
- 	struct bkey end = KEY(dc->disk.id, bio_end_sector(bio), 0);
- 
-@@ -954,7 +956,7 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s)
- static void cached_dev_nodata(struct closure *cl)
- {
- 	struct search *s = container_of(cl, struct search, cl);
--	struct bio *bio = &s->bio.bio;
-+	struct bio *bio = &s->cache_bio.bio;
- 
- 	if (s->iop.flush_journal)
- 		bch_journal_meta(s->iop.c, cl);
-@@ -1106,7 +1108,7 @@ static blk_qc_t flash_dev_make_request(struct request_queue *q,
- 
- 	s = search_alloc(bio, d);
- 	cl = &s->cl;
--	bio = &s->bio.bio;
-+	bio = &s->cache_bio.bio;
- 
- 	trace_bcache_request_start(s->d, bio);
- 
--- 
-2.13.6
-