update patches in for-next and for-test

1 files changed, 37 insertions, 0 deletions

diff --git a/for-next/0001-bcache-update-comment-for-bch_data_insert.patch b/for-next/0001-bcache-update-comment-for-bch_data_insert.patch
new file mode 100644
index 0000000..8310551
--- /dev/null
+++ b/for-next/0001-bcache-update-comment-for-bch_data_insert.patch
@@ -0,0 +1,37 @@
+From d72a86031765503e105fb0ff73a13a02376dced2 Mon Sep 17 00:00:00 2001
+From: Shenghui Wang <shhuiw@foxmail.com>
+Date: Sat, 17 Nov 2018 11:08:35 +0800
+Subject: [PATCH] bcache: update comment for bch_data_insert
+
+commit 220bb38c21b8 ("bcache: Break up struct search") introduced changes
+to struct search and s->iop.
+bypass/bio are fields of struct data_insert_op now. Update the comment.
+
+Signed-off-by: Shenghui Wang <shhuiw@foxmail.com>
+Signed-off-by: Coly Li <colyli@suse.de>
+---
+ drivers/md/bcache/request.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
+index 3bf35914bb57..15070412a32e 100644
+--- a/drivers/md/bcache/request.c
++++ b/drivers/md/bcache/request.c
+@@ -311,11 +311,11 @@ static void bch_data_insert_start(struct closure *cl)
+  * data is written it calls bch_journal, and after the keys have been added to
+  * the next journal write they're inserted into the btree.
+  *
+- * It inserts the data in s->cache_bio; bi_sector is used for the key offset,
++ * It inserts the data in op->bio; bi_sector is used for the key offset,
+  * and op->inode is used for the key inode.
+  *
+- * If s->bypass is true, instead of inserting the data it invalidates the
+- * region of the cache represented by s->cache_bio and op->inode.
++ * If op->bypass is true, instead of inserting the data it invalidates the
++ * region of the cache represented by op->bio and op->inode.
+  */
+ void bch_data_insert(struct closure *cl)
+ {
+-- 
+2.16.4
+