remove for-next/old

6 files changed, 0 insertions, 1046 deletions

diff --git a/for-next/old/0001-bcache-stop-bcache-device-when-backing-device-is-off.patch b/for-next/old/0001-bcache-stop-bcache-device-when-backing-device-is-off.patch
deleted file mode 100644
index 0dd4810..0000000
--- a/for-next/old/0001-bcache-stop-bcache-device-when-backing-device-is-off.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From ab9927b0d5edce251a9f939e4444637ded6ccddd Mon Sep 17 00:00:00 2001
-From: Coly Li <colyli@suse.de>
-Date: Mon, 5 Feb 2018 23:52:40 +0800
-Subject: [PATCH] bcache: stop bcache device when backing device is offline
-
-Currently bcache does not handle backing device failure, if backing
-device is offline and disconnected from system, its bcache device can still
-be accessible. If the bcache device is in writeback mode, I/O requests even
-can success if the requests hit on cache device. That is to say, when and
-how bcache handles offline backing device is undefined.
-
-This patch tries to handle backing device offline in a rather simple way,
-- Add cached_dev->status_update_thread kernel thread to update backing
-  device status in every 1 second.
-- Add cached_dev->offline_seconds to record how many seconds the backing
-  device is observed to be offline. If the backing device is offline for
-  BACKING_DEV_OFFLINE_TIMEOUT (30) seconds, set dc->io_disable to 1 and
-  call bcache_device_stop() to stop the bache device which linked to the
-  offline backing device.
-
-Now if a backing device is offline for BACKING_DEV_OFFLINE_TIMEOUT seconds,
-its bcache device will be removed, then user space application writing on
-it will get error immediately, and handler the device failure in time.
-
-This patch is quite simple, does not handle more complicated situations.
-Once the bcache device is stopped, users need to recovery the backing
-device, register and attach it manually.
-
-Changelog:
-v3: call wait_for_kthread_stop() before exits kernel thread.
-v2: remove "bcache: " prefix when calling pr_warn().
-v1: initial version.
-
-Signed-off-by: Coly Li <colyli@suse.de>
-Reviewed-by: Hannes Reinecke <hare@suse.com>
-Cc: Michael Lyle <mlyle@lyle.org>
-Cc: Junhui Tang <tang.junhui@zte.com.cn>
----
- drivers/md/bcache/bcache.h |  2 ++
- drivers/md/bcache/super.c  | 53 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 55 insertions(+)
-
-diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
-index 3a0cfb237af9..ba98547c4ca0 100644
---- a/drivers/md/bcache/bcache.h
-+++ b/drivers/md/bcache/bcache.h
-@@ -345,6 +345,7 @@ struct cached_dev {
- 
- 	struct keybuf		writeback_keys;
- 
-+	struct task_struct	*status_update_thread;
- 	/*
- 	 * Order the write-half of writeback operations strongly in dispatch
- 	 * order.  (Maintain LBA order; don't allow reads completing out of
-@@ -392,6 +393,7 @@ struct cached_dev {
- #define DEFAULT_CACHED_DEV_ERROR_LIMIT	64
- 	atomic_t		io_errors;
- 	unsigned		error_limit;
-+	unsigned		offline_seconds;
- 
- 	char			backing_dev_name[BDEVNAME_SIZE];
- };
-diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
-index 3dea06b41d43..a16b5b1df62a 100644
---- a/drivers/md/bcache/super.c
-+++ b/drivers/md/bcache/super.c
-@@ -654,6 +654,11 @@ static int ioctl_dev(struct block_device *b, fmode_t mode,
- 		     unsigned int cmd, unsigned long arg)
- {
- 	struct bcache_device *d = b->bd_disk->private_data;
-+	struct cached_dev *dc = container_of(d, struct cached_dev, disk);
-+
-+	if (dc->io_disable)
-+		return -EIO;
-+
- 	return d->ioctl(d, mode, cmd, arg);
- }
- 
-@@ -864,6 +869,44 @@ static void calc_cached_dev_sectors(struct cache_set *c)
- 	c->cached_dev_sectors = sectors;
- }
- 
-+#define BACKING_DEV_OFFLINE_TIMEOUT 5
-+static int cached_dev_status_update(void *arg)
-+{
-+	struct cached_dev *dc = arg;
-+	struct request_queue *q;
-+
-+	/*
-+	 * If this delayed worker is stopping outside, directly quit here.
-+	 * dc->io_disable might be set via sysfs interface, so check it
-+	 * here too.
-+	 */
-+	while (!kthread_should_stop() && !dc->io_disable) {
-+		q = bdev_get_queue(dc->bdev);
-+		if (blk_queue_dying(q))
-+			dc->offline_seconds++;
-+		else
-+			dc->offline_seconds = 0;
-+
-+		if (dc->offline_seconds >= BACKING_DEV_OFFLINE_TIMEOUT) {
-+			pr_err("%s: device offline for %d seconds",
-+			       dc->backing_dev_name,
-+			       BACKING_DEV_OFFLINE_TIMEOUT);
-+			pr_err("%s: disable I/O request due to backing "
-+			       "device offline", dc->disk.name);
-+			dc->io_disable = true;
-+			/* let others know earlier that io_disable is true */
-+			smp_mb();
-+			bcache_device_stop(&dc->disk);
-+			break;
-+		}
-+		schedule_timeout_interruptible(HZ);
-+	}
-+
-+	wait_for_kthread_stop();
-+	return 0;
-+}
-+
-+
- void bch_cached_dev_run(struct cached_dev *dc)
- {
- 	struct bcache_device *d = &dc->disk;
-@@ -906,6 +949,14 @@ void bch_cached_dev_run(struct cached_dev *dc)
- 	if (sysfs_create_link(&d->kobj, &disk_to_dev(d->disk)->kobj, "dev") ||
- 	    sysfs_create_link(&disk_to_dev(d->disk)->kobj, &d->kobj, "bcache"))
- 		pr_debug("error creating sysfs link");
-+
-+	dc->status_update_thread = kthread_run(cached_dev_status_update,
-+					       dc, "bcache_status_update");
-+	if (IS_ERR(dc->status_update_thread)) {
-+		pr_warn("failed to create bcache_status_update kthread, "
-+			"continue to run without monitoring backing "
-+			"device status");
-+	}
- }
- 
- /*
-@@ -1139,6 +1190,8 @@ static void cached_dev_free(struct closure *cl)
- 		kthread_stop(dc->writeback_thread);
- 	if (dc->writeback_write_wq)
- 		destroy_workqueue(dc->writeback_write_wq);
-+	if (!IS_ERR_OR_NULL(dc->status_update_thread))
-+		kthread_stop(dc->status_update_thread);
- 
- 	if (atomic_read(&dc->running))
- 		bd_unlink_disk_holder(dc->bdev, dc->disk.disk);
--- 
-2.16.3
-
diff --git a/for-next/old/0002-bcache-display-rate-debug-parameters-to-0-when-write.patch b/for-next/old/0002-bcache-display-rate-debug-parameters-to-0-when-write.patch
deleted file mode 100644
index 045564f..0000000
--- a/for-next/old/0002-bcache-display-rate-debug-parameters-to-0-when-write.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 8510f07bf9fe512839821b0a796f7439e104d14f Mon Sep 17 00:00:00 2001
-From: Coly Li <colyli@suse.de>
-Date: Sat, 5 May 2018 20:52:33 +0800
-Subject: [PATCH 2/6] bcache: display rate debug parameters to 0 when writeback
- is not running
-
-When writeback is not running, writeback rate should be 0, other value is
-misleading. And the following dyanmic writeback rate debug parameters
-should be 0 too,
-	rate, proportional, integral, change
-otherwise they are misleading when writeback is not running.
-
-Signed-off-by: Coly Li <colyli@suse.de>
----
- drivers/md/bcache/sysfs.c | 26 ++++++++++++++++----------
- 1 file changed, 16 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
-index dfeef583ee50..6ef6616fb76e 100644
---- a/drivers/md/bcache/sysfs.c
-+++ b/drivers/md/bcache/sysfs.c
-@@ -119,6 +119,7 @@ SHOW(__bch_cached_dev)
- 	struct cached_dev *dc = container_of(kobj, struct cached_dev,
- 					     disk.kobj);
- 	const char *states[] = { "no cache", "clean", "dirty", "inconsistent" };
-+	int wb = dc->writeback_running;
- 
- #define var(stat)		(dc->stat)
- 
-@@ -140,7 +141,7 @@ SHOW(__bch_cached_dev)
- 	var_printf(writeback_running,	"%i");
- 	var_print(writeback_delay);
- 	var_print(writeback_percent);
--	sysfs_hprint(writeback_rate,	dc->writeback_rate.rate << 9);
-+	sysfs_hprint(writeback_rate,	wb ? dc->writeback_rate.rate << 9 : 0);
- 	sysfs_hprint(io_errors,		atomic_read(&dc->io_errors));
- 	sysfs_printf(io_error_limit,	"%i", dc->error_limit);
- 	sysfs_printf(io_disable,	"%i", dc->io_disable);
-@@ -158,15 +159,20 @@ SHOW(__bch_cached_dev)
- 		char change[20];
- 		s64 next_io;
- 
--		bch_hprint(rate,	dc->writeback_rate.rate << 9);
--		bch_hprint(dirty,	bcache_dev_sectors_dirty(&dc->disk) << 9);
--		bch_hprint(target,	dc->writeback_rate_target << 9);
--		bch_hprint(proportional,dc->writeback_rate_proportional << 9);
--		bch_hprint(integral,	dc->writeback_rate_integral_scaled << 9);
--		bch_hprint(change,	dc->writeback_rate_change << 9);
--
--		next_io = div64_s64(dc->writeback_rate.next - local_clock(),
--				    NSEC_PER_MSEC);
-+		/*
-+		 * Except for dirty and target, other values should
-+		 * be 0 if writeback is not running.
-+		 */
-+		bch_hprint(rate, wb ? dc->writeback_rate.rate << 9 : 0);
-+		bch_hprint(dirty, bcache_dev_sectors_dirty(&dc->disk) << 9);
-+		bch_hprint(target, dc->writeback_rate_target << 9);
-+		bch_hprint(proportional,
-+			   wb ? dc->writeback_rate_proportional << 9 : 0);
-+		bch_hprint(integral,
-+			   wb ? dc->writeback_rate_integral_scaled << 9 : 0);
-+		bch_hprint(change, wb ? dc->writeback_rate_change << 9 : 0);
-+		next_io = wb ? div64_s64(dc->writeback_rate.next-local_clock(),
-+					 NSEC_PER_MSEC) : 0;
- 
- 		return sprintf(buf,
- 			       "rate:\t\t%s/sec\n"
--- 
-2.16.3
-
diff --git a/for-next/old/0003-bcache-Split-out-crc64-to-library.patch b/for-next/old/0003-bcache-Split-out-crc64-to-library.patch
deleted file mode 100644
index 1ee64c8..0000000
--- a/for-next/old/0003-bcache-Split-out-crc64-to-library.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-From db7c38f38e004877240c2bc1a80f4e81d3857e9c Mon Sep 17 00:00:00 2001
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Fri, 4 May 2018 19:00:15 +0300
-Subject: [PATCH 3/6] bcache: Split out crc64 to library
-
-For generic use split out crc64 code to a separate module
-in the library folder.
-
-No functional change intended.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Coly Li <colyli@suse.de>
----
- drivers/md/bcache/Kconfig   |   1 +
- drivers/md/bcache/bcache.h  |   2 +-
- drivers/md/bcache/btree.c   |   2 +-
- drivers/md/bcache/request.c |   2 +-
- drivers/md/bcache/super.c   |   4 +-
- drivers/md/bcache/util.c    | 131 ------------------------------------------
- drivers/md/bcache/util.h    |   4 +-
- include/linux/crc64.h       |   9 +++
- lib/Kconfig                 |   8 +++
- lib/Makefile                |   1 +
- lib/crc64.c                 | 137 ++++++++++++++++++++++++++++++++++++++++++++
- 11 files changed, 162 insertions(+), 139 deletions(-)
- create mode 100644 include/linux/crc64.h
- create mode 100644 lib/crc64.c
-
-diff --git a/drivers/md/bcache/Kconfig b/drivers/md/bcache/Kconfig
-index 4d200883c505..e94179e7fd76 100644
---- a/drivers/md/bcache/Kconfig
-+++ b/drivers/md/bcache/Kconfig
-@@ -1,6 +1,7 @@
- 
- config BCACHE
- 	tristate "Block device as cache"
-+	select CRC64
- 	---help---
- 	Allows a block device to be used as cache for other devices; uses
- 	a btree for indexing and the layout is optimized for SSDs.
-diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
-index ba98547c4ca0..a425fb49fd47 100644
---- a/drivers/md/bcache/bcache.h
-+++ b/drivers/md/bcache/bcache.h
-@@ -803,7 +803,7 @@ static inline bool ptr_available(struct cache_set *c, const struct bkey *k,
-  * jset: The checksum is _always_ the first 8 bytes of these structs
-  */
- #define csum_set(i)							\
--	bch_crc64(((void *) (i)) + sizeof(uint64_t),			\
-+	crc64(((void *) (i)) + sizeof(uint64_t),			\
- 		  ((void *) bset_bkey_last(i)) -			\
- 		  (((void *) (i)) + sizeof(uint64_t)))
- 
-diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
-index 17936b2dc7d6..c239862127e7 100644
---- a/drivers/md/bcache/btree.c
-+++ b/drivers/md/bcache/btree.c
-@@ -194,7 +194,7 @@ static uint64_t btree_csum_set(struct btree *b, struct bset *i)
- 	uint64_t crc = b->key.ptr[0];
- 	void *data = (void *) i + 8, *end = bset_bkey_last(i);
- 
--	crc = bch_crc64_update(crc, data, end - data);
-+	crc = crc64_update(crc, data, end - data);
- 	return crc ^ 0xffffffffffffffffULL;
- }
- 
-diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
-index 8e3e8655ed63..65dbc0ccd913 100644
---- a/drivers/md/bcache/request.c
-+++ b/drivers/md/bcache/request.c
-@@ -45,7 +45,7 @@ static void bio_csum(struct bio *bio, struct bkey *k)
- 
- 	bio_for_each_segment(bv, bio, iter) {
- 		void *d = kmap(bv.bv_page) + bv.bv_offset;
--		csum = bch_crc64_update(csum, d, bv.bv_len);
-+		csum = crc64_update(csum, d, bv.bv_len);
- 		kunmap(bv.bv_page);
- 	}
- 
-diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
-index bc8b2a1ffdc3..53becf1facbd 100644
---- a/drivers/md/bcache/super.c
-+++ b/drivers/md/bcache/super.c
-@@ -567,7 +567,7 @@ void bch_prio_write(struct cache *ca)
- 
- 		p->next_bucket	= ca->prio_buckets[i + 1];
- 		p->magic	= pset_magic(&ca->sb);
--		p->csum		= bch_crc64(&p->magic, bucket_bytes(ca) - 8);
-+		p->csum		= crc64(&p->magic, bucket_bytes(ca) - 8);
- 
- 		bucket = bch_bucket_alloc(ca, RESERVE_PRIO, true);
- 		BUG_ON(bucket == -1);
-@@ -617,7 +617,7 @@ static void prio_read(struct cache *ca, uint64_t bucket)
- 
- 			prio_io(ca, bucket, REQ_OP_READ, 0);
- 
--			if (p->csum != bch_crc64(&p->magic, bucket_bytes(ca) - 8))
-+			if (p->csum != crc64(&p->magic, bucket_bytes(ca) - 8))
- 				pr_warn("bad csum reading priorities");
- 
- 			if (p->magic != pset_magic(&ca->sb))
-diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c
-index 74febd5230df..cdf822c0ac1b 100644
---- a/drivers/md/bcache/util.c
-+++ b/drivers/md/bcache/util.c
-@@ -314,134 +314,3 @@ int bch_bio_alloc_pages(struct bio *bio, gfp_t gfp_mask)
- 
- 	return 0;
- }
--
--/*
-- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group (Any
-- * use permitted, subject to terms of PostgreSQL license; see.)
--
-- * If we have a 64-bit integer type, then a 64-bit CRC looks just like the
-- * usual sort of implementation. (See Ross Williams' excellent introduction
-- * A PAINLESS GUIDE TO CRC ERROR DETECTION ALGORITHMS, available from
-- * ftp://ftp.rocksoft.com/papers/crc_v3.txt or several other net sites.)
-- * If we have no working 64-bit type, then fake it with two 32-bit registers.
-- *
-- * The present implementation is a normal (not "reflected", in Williams'
-- * terms) 64-bit CRC, using initial all-ones register contents and a final
-- * bit inversion. The chosen polynomial is borrowed from the DLT1 spec
-- * (ECMA-182, available from http://www.ecma.ch/ecma1/STAND/ECMA-182.HTM):
-- *
-- * x^64 + x^62 + x^57 + x^55 + x^54 + x^53 + x^52 + x^47 + x^46 + x^45 +
-- * x^40 + x^39 + x^38 + x^37 + x^35 + x^33 + x^32 + x^31 + x^29 + x^27 +
-- * x^24 + x^23 + x^22 + x^21 + x^19 + x^17 + x^13 + x^12 + x^10 + x^9 +
-- * x^7 + x^4 + x + 1
--*/
--
--static const uint64_t crc_table[256] = {
--	0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
--	0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
--	0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
--	0xD0962D61B56FEF2DULL, 0x17870F5D4F51B498ULL, 0x5577EEB6E6BB820BULL,
--	0xDB55AACF12C73561ULL, 0x99A54B24BB2D03F2ULL, 0x5EB4691841135847ULL,
--	0x1C4488F3E8F96ED4ULL, 0x663D78FF90E185EFULL, 0x24CD9914390BB37CULL,
--	0xE3DCBB28C335E8C9ULL, 0xA12C5AC36ADFDE5AULL, 0x2F0E1EBA9EA36930ULL,
--	0x6DFEFF5137495FA3ULL, 0xAAEFDD6DCD770416ULL, 0xE81F3C86649D3285ULL,
--	0xF45BB4758C645C51ULL, 0xB6AB559E258E6AC2ULL, 0x71BA77A2DFB03177ULL,
--	0x334A9649765A07E4ULL, 0xBD68D2308226B08EULL, 0xFF9833DB2BCC861DULL,
--	0x388911E7D1F2DDA8ULL, 0x7A79F00C7818EB3BULL, 0xCC7AF1FF21C30BDEULL,
--	0x8E8A101488293D4DULL, 0x499B3228721766F8ULL, 0x0B6BD3C3DBFD506BULL,
--	0x854997BA2F81E701ULL, 0xC7B97651866BD192ULL, 0x00A8546D7C558A27ULL,
--	0x4258B586D5BFBCB4ULL, 0x5E1C3D753D46D260ULL, 0x1CECDC9E94ACE4F3ULL,
--	0xDBFDFEA26E92BF46ULL, 0x990D1F49C77889D5ULL, 0x172F5B3033043EBFULL,
--	0x55DFBADB9AEE082CULL, 0x92CE98E760D05399ULL, 0xD03E790CC93A650AULL,
--	0xAA478900B1228E31ULL, 0xE8B768EB18C8B8A2ULL, 0x2FA64AD7E2F6E317ULL,
--	0x6D56AB3C4B1CD584ULL, 0xE374EF45BF6062EEULL, 0xA1840EAE168A547DULL,
--	0x66952C92ECB40FC8ULL, 0x2465CD79455E395BULL, 0x3821458AADA7578FULL,
--	0x7AD1A461044D611CULL, 0xBDC0865DFE733AA9ULL, 0xFF3067B657990C3AULL,
--	0x711223CFA3E5BB50ULL, 0x33E2C2240A0F8DC3ULL, 0xF4F3E018F031D676ULL,
--	0xB60301F359DBE0E5ULL, 0xDA050215EA6C212FULL, 0x98F5E3FE438617BCULL,
--	0x5FE4C1C2B9B84C09ULL, 0x1D14202910527A9AULL, 0x93366450E42ECDF0ULL,
--	0xD1C685BB4DC4FB63ULL, 0x16D7A787B7FAA0D6ULL, 0x5427466C1E109645ULL,
--	0x4863CE9FF6E9F891ULL, 0x0A932F745F03CE02ULL, 0xCD820D48A53D95B7ULL,
--	0x8F72ECA30CD7A324ULL, 0x0150A8DAF8AB144EULL, 0x43A04931514122DDULL,
--	0x84B16B0DAB7F7968ULL, 0xC6418AE602954FFBULL, 0xBC387AEA7A8DA4C0ULL,
--	0xFEC89B01D3679253ULL, 0x39D9B93D2959C9E6ULL, 0x7B2958D680B3FF75ULL,
--	0xF50B1CAF74CF481FULL, 0xB7FBFD44DD257E8CULL, 0x70EADF78271B2539ULL,
--	0x321A3E938EF113AAULL, 0x2E5EB66066087D7EULL, 0x6CAE578BCFE24BEDULL,
--	0xABBF75B735DC1058ULL, 0xE94F945C9C3626CBULL, 0x676DD025684A91A1ULL,
--	0x259D31CEC1A0A732ULL, 0xE28C13F23B9EFC87ULL, 0xA07CF2199274CA14ULL,
--	0x167FF3EACBAF2AF1ULL, 0x548F120162451C62ULL, 0x939E303D987B47D7ULL,
--	0xD16ED1D631917144ULL, 0x5F4C95AFC5EDC62EULL, 0x1DBC74446C07F0BDULL,
--	0xDAAD56789639AB08ULL, 0x985DB7933FD39D9BULL, 0x84193F60D72AF34FULL,
--	0xC6E9DE8B7EC0C5DCULL, 0x01F8FCB784FE9E69ULL, 0x43081D5C2D14A8FAULL,
--	0xCD2A5925D9681F90ULL, 0x8FDAB8CE70822903ULL, 0x48CB9AF28ABC72B6ULL,
--	0x0A3B7B1923564425ULL, 0x70428B155B4EAF1EULL, 0x32B26AFEF2A4998DULL,
--	0xF5A348C2089AC238ULL, 0xB753A929A170F4ABULL, 0x3971ED50550C43C1ULL,
--	0x7B810CBBFCE67552ULL, 0xBC902E8706D82EE7ULL, 0xFE60CF6CAF321874ULL,
--	0xE224479F47CB76A0ULL, 0xA0D4A674EE214033ULL, 0x67C58448141F1B86ULL,
--	0x253565A3BDF52D15ULL, 0xAB1721DA49899A7FULL, 0xE9E7C031E063ACECULL,
--	0x2EF6E20D1A5DF759ULL, 0x6C0603E6B3B7C1CAULL, 0xF6FAE5C07D3274CDULL,
--	0xB40A042BD4D8425EULL, 0x731B26172EE619EBULL, 0x31EBC7FC870C2F78ULL,
--	0xBFC9838573709812ULL, 0xFD39626EDA9AAE81ULL, 0x3A28405220A4F534ULL,
--	0x78D8A1B9894EC3A7ULL, 0x649C294A61B7AD73ULL, 0x266CC8A1C85D9BE0ULL,
--	0xE17DEA9D3263C055ULL, 0xA38D0B769B89F6C6ULL, 0x2DAF4F0F6FF541ACULL,
--	0x6F5FAEE4C61F773FULL, 0xA84E8CD83C212C8AULL, 0xEABE6D3395CB1A19ULL,
--	0x90C79D3FEDD3F122ULL, 0xD2377CD44439C7B1ULL, 0x15265EE8BE079C04ULL,
--	0x57D6BF0317EDAA97ULL, 0xD9F4FB7AE3911DFDULL, 0x9B041A914A7B2B6EULL,
--	0x5C1538ADB04570DBULL, 0x1EE5D94619AF4648ULL, 0x02A151B5F156289CULL,
--	0x4051B05E58BC1E0FULL, 0x87409262A28245BAULL, 0xC5B073890B687329ULL,
--	0x4B9237F0FF14C443ULL, 0x0962D61B56FEF2D0ULL, 0xCE73F427ACC0A965ULL,
--	0x8C8315CC052A9FF6ULL, 0x3A80143F5CF17F13ULL, 0x7870F5D4F51B4980ULL,
--	0xBF61D7E80F251235ULL, 0xFD913603A6CF24A6ULL, 0x73B3727A52B393CCULL,
--	0x31439391FB59A55FULL, 0xF652B1AD0167FEEAULL, 0xB4A25046A88DC879ULL,
--	0xA8E6D8B54074A6ADULL, 0xEA16395EE99E903EULL, 0x2D071B6213A0CB8BULL,
--	0x6FF7FA89BA4AFD18ULL, 0xE1D5BEF04E364A72ULL, 0xA3255F1BE7DC7CE1ULL,
--	0x64347D271DE22754ULL, 0x26C49CCCB40811C7ULL, 0x5CBD6CC0CC10FAFCULL,
--	0x1E4D8D2B65FACC6FULL, 0xD95CAF179FC497DAULL, 0x9BAC4EFC362EA149ULL,
--	0x158E0A85C2521623ULL, 0x577EEB6E6BB820B0ULL, 0x906FC95291867B05ULL,
--	0xD29F28B9386C4D96ULL, 0xCEDBA04AD0952342ULL, 0x8C2B41A1797F15D1ULL,
--	0x4B3A639D83414E64ULL, 0x09CA82762AAB78F7ULL, 0x87E8C60FDED7CF9DULL,
--	0xC51827E4773DF90EULL, 0x020905D88D03A2BBULL, 0x40F9E43324E99428ULL,
--	0x2CFFE7D5975E55E2ULL, 0x6E0F063E3EB46371ULL, 0xA91E2402C48A38C4ULL,
--	0xEBEEC5E96D600E57ULL, 0x65CC8190991CB93DULL, 0x273C607B30F68FAEULL,
--	0xE02D4247CAC8D41BULL, 0xA2DDA3AC6322E288ULL, 0xBE992B5F8BDB8C5CULL,
--	0xFC69CAB42231BACFULL, 0x3B78E888D80FE17AULL, 0x7988096371E5D7E9ULL,
--	0xF7AA4D1A85996083ULL, 0xB55AACF12C735610ULL, 0x724B8ECDD64D0DA5ULL,
--	0x30BB6F267FA73B36ULL, 0x4AC29F2A07BFD00DULL, 0x08327EC1AE55E69EULL,
--	0xCF235CFD546BBD2BULL, 0x8DD3BD16FD818BB8ULL, 0x03F1F96F09FD3CD2ULL,
--	0x41011884A0170A41ULL, 0x86103AB85A2951F4ULL, 0xC4E0DB53F3C36767ULL,
--	0xD8A453A01B3A09B3ULL, 0x9A54B24BB2D03F20ULL, 0x5D45907748EE6495ULL,
--	0x1FB5719CE1045206ULL, 0x919735E51578E56CULL, 0xD367D40EBC92D3FFULL,
--	0x1476F63246AC884AULL, 0x568617D9EF46BED9ULL, 0xE085162AB69D5E3CULL,
--	0xA275F7C11F7768AFULL, 0x6564D5FDE549331AULL, 0x279434164CA30589ULL,
--	0xA9B6706FB8DFB2E3ULL, 0xEB46918411358470ULL, 0x2C57B3B8EB0BDFC5ULL,
--	0x6EA7525342E1E956ULL, 0x72E3DAA0AA188782ULL, 0x30133B4B03F2B111ULL,
--	0xF7021977F9CCEAA4ULL, 0xB5F2F89C5026DC37ULL, 0x3BD0BCE5A45A6B5DULL,
--	0x79205D0E0DB05DCEULL, 0xBE317F32F78E067BULL, 0xFCC19ED95E6430E8ULL,
--	0x86B86ED5267CDBD3ULL, 0xC4488F3E8F96ED40ULL, 0x0359AD0275A8B6F5ULL,
--	0x41A94CE9DC428066ULL, 0xCF8B0890283E370CULL, 0x8D7BE97B81D4019FULL,
--	0x4A6ACB477BEA5A2AULL, 0x089A2AACD2006CB9ULL, 0x14DEA25F3AF9026DULL,
--	0x562E43B4931334FEULL, 0x913F6188692D6F4BULL, 0xD3CF8063C0C759D8ULL,
--	0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL,
--	0x9AFCE626CE85B507ULL,
--};
--
--uint64_t bch_crc64_update(uint64_t crc, const void *_data, size_t len)
--{
--	const unsigned char *data = _data;
--
--	while (len--) {
--		int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
--		crc = crc_table[i] ^ (crc << 8);
--	}
--
--	return crc;
--}
--
--uint64_t bch_crc64(const void *data, size_t len)
--{
--	uint64_t crc = 0xffffffffffffffffULL;
--
--	crc = bch_crc64_update(crc, data, len);
--
--	return crc ^ 0xffffffffffffffffULL;
--}
-diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
-index 268024529edd..bd70f1c6a176 100644
---- a/drivers/md/bcache/util.h
-+++ b/drivers/md/bcache/util.h
-@@ -4,6 +4,7 @@
- #define _BCACHE_UTIL_H
- 
- #include <linux/blkdev.h>
-+#include <linux/crc64.h>
- #include <linux/errno.h>
- #include <linux/kernel.h>
- #include <linux/sched/clock.h>
-@@ -567,7 +568,4 @@ static inline sector_t bdev_sectors(struct block_device *bdev)
- 	return bdev->bd_inode->i_size >> 9;
- }
- 
--uint64_t bch_crc64_update(uint64_t, const void *, size_t);
--uint64_t bch_crc64(const void *, size_t);
--
- #endif /* _BCACHE_UTIL_H */
-diff --git a/include/linux/crc64.h b/include/linux/crc64.h
-new file mode 100644
-index 000000000000..2a8f6005e8ee
---- /dev/null
-+++ b/include/linux/crc64.h
-@@ -0,0 +1,9 @@
-+#ifndef _LINUX_CRC64_H
-+#define _LINUX_CRC64_H
-+
-+#include <linux/types.h>
-+
-+uint64_t crc64_update(uint64_t crc, const void *data, size_t len);
-+uint64_t crc64(const void *data, size_t len);
-+
-+#endif /* _LINUX_CRC64_H */
-diff --git a/lib/Kconfig b/lib/Kconfig
-index 5fe577673b98..fa69362fba01 100644
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -170,6 +170,14 @@ config CRC32_BIT
- 
- endchoice
- 
-+config CRC64
-+	tristate "CRC64 functions"
-+	help
-+	  This option is provided for the case where no in-kernel-tree
-+	  modules require CRC64 functions, but a module built outside
-+	  the kernel tree does. Such modules that use library CRC64
-+	  functions require M here.
-+
- config CRC4
- 	tristate "CRC4 functions"
- 	help
-diff --git a/lib/Makefile b/lib/Makefile
-index ce20696d5a92..32d574d89059 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -108,6 +108,7 @@ obj-$(CONFIG_CRC_T10DIF)+= crc-t10dif.o
- obj-$(CONFIG_CRC_ITU_T)	+= crc-itu-t.o
- obj-$(CONFIG_CRC32)	+= crc32.o
- obj-$(CONFIG_CRC32_SELFTEST)	+= crc32test.o
-+obj-$(CONFIG_CRC64)	+= crc64.o
- obj-$(CONFIG_CRC4)	+= crc4.o
- obj-$(CONFIG_CRC7)	+= crc7.o
- obj-$(CONFIG_LIBCRC32C)	+= libcrc32c.o
-diff --git a/lib/crc64.c b/lib/crc64.c
-new file mode 100644
-index 000000000000..ed0ffac7b26a
---- /dev/null
-+++ b/lib/crc64.c
-@@ -0,0 +1,137 @@
-+/*
-+ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group (Any
-+ * use permitted, subject to terms of PostgreSQL license; see.)
-+
-+ * If we have a 64-bit integer type, then a 64-bit CRC looks just like the
-+ * usual sort of implementation. (See Ross Williams' excellent introduction
-+ * A PAINLESS GUIDE TO CRC ERROR DETECTION ALGORITHMS, available from
-+ * ftp://ftp.rocksoft.com/papers/crc_v3.txt or several other net sites.)
-+ * If we have no working 64-bit type, then fake it with two 32-bit registers.
-+ *
-+ * The present implementation is a normal (not "reflected", in Williams'
-+ * terms) 64-bit CRC, using initial all-ones register contents and a final
-+ * bit inversion. The chosen polynomial is borrowed from the DLT1 spec
-+ * (ECMA-182, available from http://www.ecma.ch/ecma1/STAND/ECMA-182.HTM):
-+ *
-+ * x^64 + x^62 + x^57 + x^55 + x^54 + x^53 + x^52 + x^47 + x^46 + x^45 +
-+ * x^40 + x^39 + x^38 + x^37 + x^35 + x^33 + x^32 + x^31 + x^29 + x^27 +
-+ * x^24 + x^23 + x^22 + x^21 + x^19 + x^17 + x^13 + x^12 + x^10 + x^9 +
-+ * x^7 + x^4 + x + 1
-+*/
-+
-+#include <linux/crc64.h>
-+#include <linux/module.h>
-+
-+static const uint64_t crc_table[256] = {
-+	0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
-+	0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
-+	0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
-+	0xD0962D61B56FEF2DULL, 0x17870F5D4F51B498ULL, 0x5577EEB6E6BB820BULL,
-+	0xDB55AACF12C73561ULL, 0x99A54B24BB2D03F2ULL, 0x5EB4691841135847ULL,
-+	0x1C4488F3E8F96ED4ULL, 0x663D78FF90E185EFULL, 0x24CD9914390BB37CULL,
-+	0xE3DCBB28C335E8C9ULL, 0xA12C5AC36ADFDE5AULL, 0x2F0E1EBA9EA36930ULL,
-+	0x6DFEFF5137495FA3ULL, 0xAAEFDD6DCD770416ULL, 0xE81F3C86649D3285ULL,
-+	0xF45BB4758C645C51ULL, 0xB6AB559E258E6AC2ULL, 0x71BA77A2DFB03177ULL,
-+	0x334A9649765A07E4ULL, 0xBD68D2308226B08EULL, 0xFF9833DB2BCC861DULL,
-+	0x388911E7D1F2DDA8ULL, 0x7A79F00C7818EB3BULL, 0xCC7AF1FF21C30BDEULL,
-+	0x8E8A101488293D4DULL, 0x499B3228721766F8ULL, 0x0B6BD3C3DBFD506BULL,
-+	0x854997BA2F81E701ULL, 0xC7B97651866BD192ULL, 0x00A8546D7C558A27ULL,
-+	0x4258B586D5BFBCB4ULL, 0x5E1C3D753D46D260ULL, 0x1CECDC9E94ACE4F3ULL,
-+	0xDBFDFEA26E92BF46ULL, 0x990D1F49C77889D5ULL, 0x172F5B3033043EBFULL,
-+	0x55DFBADB9AEE082CULL, 0x92CE98E760D05399ULL, 0xD03E790CC93A650AULL,
-+	0xAA478900B1228E31ULL, 0xE8B768EB18C8B8A2ULL, 0x2FA64AD7E2F6E317ULL,
-+	0x6D56AB3C4B1CD584ULL, 0xE374EF45BF6062EEULL, 0xA1840EAE168A547DULL,
-+	0x66952C92ECB40FC8ULL, 0x2465CD79455E395BULL, 0x3821458AADA7578FULL,
-+	0x7AD1A461044D611CULL, 0xBDC0865DFE733AA9ULL, 0xFF3067B657990C3AULL,
-+	0x711223CFA3E5BB50ULL, 0x33E2C2240A0F8DC3ULL, 0xF4F3E018F031D676ULL,
-+	0xB60301F359DBE0E5ULL, 0xDA050215EA6C212FULL, 0x98F5E3FE438617BCULL,
-+	0x5FE4C1C2B9B84C09ULL, 0x1D14202910527A9AULL, 0x93366450E42ECDF0ULL,
-+	0xD1C685BB4DC4FB63ULL, 0x16D7A787B7FAA0D6ULL, 0x5427466C1E109645ULL,
-+	0x4863CE9FF6E9F891ULL, 0x0A932F745F03CE02ULL, 0xCD820D48A53D95B7ULL,
-+	0x8F72ECA30CD7A324ULL, 0x0150A8DAF8AB144EULL, 0x43A04931514122DDULL,
-+	0x84B16B0DAB7F7968ULL, 0xC6418AE602954FFBULL, 0xBC387AEA7A8DA4C0ULL,
-+	0xFEC89B01D3679253ULL, 0x39D9B93D2959C9E6ULL, 0x7B2958D680B3FF75ULL,
-+	0xF50B1CAF74CF481FULL, 0xB7FBFD44DD257E8CULL, 0x70EADF78271B2539ULL,
-+	0x321A3E938EF113AAULL, 0x2E5EB66066087D7EULL, 0x6CAE578BCFE24BEDULL,
-+	0xABBF75B735DC1058ULL, 0xE94F945C9C3626CBULL, 0x676DD025684A91A1ULL,
-+	0x259D31CEC1A0A732ULL, 0xE28C13F23B9EFC87ULL, 0xA07CF2199274CA14ULL,
-+	0x167FF3EACBAF2AF1ULL, 0x548F120162451C62ULL, 0x939E303D987B47D7ULL,
-+	0xD16ED1D631917144ULL, 0x5F4C95AFC5EDC62EULL, 0x1DBC74446C07F0BDULL,
-+	0xDAAD56789639AB08ULL, 0x985DB7933FD39D9BULL, 0x84193F60D72AF34FULL,
-+	0xC6E9DE8B7EC0C5DCULL, 0x01F8FCB784FE9E69ULL, 0x43081D5C2D14A8FAULL,
-+	0xCD2A5925D9681F90ULL, 0x8FDAB8CE70822903ULL, 0x48CB9AF28ABC72B6ULL,
-+	0x0A3B7B1923564425ULL, 0x70428B155B4EAF1EULL, 0x32B26AFEF2A4998DULL,
-+	0xF5A348C2089AC238ULL, 0xB753A929A170F4ABULL, 0x3971ED50550C43C1ULL,
-+	0x7B810CBBFCE67552ULL, 0xBC902E8706D82EE7ULL, 0xFE60CF6CAF321874ULL,
-+	0xE224479F47CB76A0ULL, 0xA0D4A674EE214033ULL, 0x67C58448141F1B86ULL,
-+	0x253565A3BDF52D15ULL, 0xAB1721DA49899A7FULL, 0xE9E7C031E063ACECULL,
-+	0x2EF6E20D1A5DF759ULL, 0x6C0603E6B3B7C1CAULL, 0xF6FAE5C07D3274CDULL,
-+	0xB40A042BD4D8425EULL, 0x731B26172EE619EBULL, 0x31EBC7FC870C2F78ULL,
-+	0xBFC9838573709812ULL, 0xFD39626EDA9AAE81ULL, 0x3A28405220A4F534ULL,
-+	0x78D8A1B9894EC3A7ULL, 0x649C294A61B7AD73ULL, 0x266CC8A1C85D9BE0ULL,
-+	0xE17DEA9D3263C055ULL, 0xA38D0B769B89F6C6ULL, 0x2DAF4F0F6FF541ACULL,
-+	0x6F5FAEE4C61F773FULL, 0xA84E8CD83C212C8AULL, 0xEABE6D3395CB1A19ULL,
-+	0x90C79D3FEDD3F122ULL, 0xD2377CD44439C7B1ULL, 0x15265EE8BE079C04ULL,
-+	0x57D6BF0317EDAA97ULL, 0xD9F4FB7AE3911DFDULL, 0x9B041A914A7B2B6EULL,
-+	0x5C1538ADB04570DBULL, 0x1EE5D94619AF4648ULL, 0x02A151B5F156289CULL,
-+	0x4051B05E58BC1E0FULL, 0x87409262A28245BAULL, 0xC5B073890B687329ULL,
-+	0x4B9237F0FF14C443ULL, 0x0962D61B56FEF2D0ULL, 0xCE73F427ACC0A965ULL,
-+	0x8C8315CC052A9FF6ULL, 0x3A80143F5CF17F13ULL, 0x7870F5D4F51B4980ULL,
-+	0xBF61D7E80F251235ULL, 0xFD913603A6CF24A6ULL, 0x73B3727A52B393CCULL,
-+	0x31439391FB59A55FULL, 0xF652B1AD0167FEEAULL, 0xB4A25046A88DC879ULL,
-+	0xA8E6D8B54074A6ADULL, 0xEA16395EE99E903EULL, 0x2D071B6213A0CB8BULL,
-+	0x6FF7FA89BA4AFD18ULL, 0xE1D5BEF04E364A72ULL, 0xA3255F1BE7DC7CE1ULL,
-+	0x64347D271DE22754ULL, 0x26C49CCCB40811C7ULL, 0x5CBD6CC0CC10FAFCULL,
-+	0x1E4D8D2B65FACC6FULL, 0xD95CAF179FC497DAULL, 0x9BAC4EFC362EA149ULL,
-+	0x158E0A85C2521623ULL, 0x577EEB6E6BB820B0ULL, 0x906FC95291867B05ULL,
-+	0xD29F28B9386C4D96ULL, 0xCEDBA04AD0952342ULL, 0x8C2B41A1797F15D1ULL,
-+	0x4B3A639D83414E64ULL, 0x09CA82762AAB78F7ULL, 0x87E8C60FDED7CF9DULL,
-+	0xC51827E4773DF90EULL, 0x020905D88D03A2BBULL, 0x40F9E43324E99428ULL,
-+	0x2CFFE7D5975E55E2ULL, 0x6E0F063E3EB46371ULL, 0xA91E2402C48A38C4ULL,
-+	0xEBEEC5E96D600E57ULL, 0x65CC8190991CB93DULL, 0x273C607B30F68FAEULL,
-+	0xE02D4247CAC8D41BULL, 0xA2DDA3AC6322E288ULL, 0xBE992B5F8BDB8C5CULL,
-+	0xFC69CAB42231BACFULL, 0x3B78E888D80FE17AULL, 0x7988096371E5D7E9ULL,
-+	0xF7AA4D1A85996083ULL, 0xB55AACF12C735610ULL, 0x724B8ECDD64D0DA5ULL,
-+	0x30BB6F267FA73B36ULL, 0x4AC29F2A07BFD00DULL, 0x08327EC1AE55E69EULL,
-+	0xCF235CFD546BBD2BULL, 0x8DD3BD16FD818BB8ULL, 0x03F1F96F09FD3CD2ULL,
-+	0x41011884A0170A41ULL, 0x86103AB85A2951F4ULL, 0xC4E0DB53F3C36767ULL,
-+	0xD8A453A01B3A09B3ULL, 0x9A54B24BB2D03F20ULL, 0x5D45907748EE6495ULL,
-+	0x1FB5719CE1045206ULL, 0x919735E51578E56CULL, 0xD367D40EBC92D3FFULL,
-+	0x1476F63246AC884AULL, 0x568617D9EF46BED9ULL, 0xE085162AB69D5E3CULL,
-+	0xA275F7C11F7768AFULL, 0x6564D5FDE549331AULL, 0x279434164CA30589ULL,
-+	0xA9B6706FB8DFB2E3ULL, 0xEB46918411358470ULL, 0x2C57B3B8EB0BDFC5ULL,
-+	0x6EA7525342E1E956ULL, 0x72E3DAA0AA188782ULL, 0x30133B4B03F2B111ULL,
-+	0xF7021977F9CCEAA4ULL, 0xB5F2F89C5026DC37ULL, 0x3BD0BCE5A45A6B5DULL,
-+	0x79205D0E0DB05DCEULL, 0xBE317F32F78E067BULL, 0xFCC19ED95E6430E8ULL,
-+	0x86B86ED5267CDBD3ULL, 0xC4488F3E8F96ED40ULL, 0x0359AD0275A8B6F5ULL,
-+	0x41A94CE9DC428066ULL, 0xCF8B0890283E370CULL, 0x8D7BE97B81D4019FULL,
-+	0x4A6ACB477BEA5A2AULL, 0x089A2AACD2006CB9ULL, 0x14DEA25F3AF9026DULL,
-+	0x562E43B4931334FEULL, 0x913F6188692D6F4BULL, 0xD3CF8063C0C759D8ULL,
-+	0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL,
-+	0x9AFCE626CE85B507ULL,
-+};
-+
-+uint64_t crc64_update(uint64_t crc, const void *data, size_t len)
-+{
-+	const unsigned char *_data = data;
-+
-+	while (len--) {
-+		int i = ((int) (crc >> 56) ^ *_data++) & 0xFF;
-+		crc = crc_table[i] ^ (crc << 8);
-+	}
-+
-+	return crc;
-+}
-+EXPORT_SYMBOL_GPL(crc64_update);
-+
-+uint64_t crc64(const void *data, size_t len)
-+{
-+	uint64_t crc = 0xffffffffffffffffULL;
-+
-+	crc = crc64_update(crc, data, len);
-+
-+	return crc ^ 0xffffffffffffffffULL;
-+}
-+EXPORT_SYMBOL_GPL(crc64);
-+
-+MODULE_DESCRIPTION("CRC64 calculations");
--- 
-2.16.3
-
diff --git a/for-next/old/0004-bcache-Move-couple-of-string-arrays-to-sysfs.c.patch b/for-next/old/0004-bcache-Move-couple-of-string-arrays-to-sysfs.c.patch
deleted file mode 100644
index d67ab19..0000000
--- a/for-next/old/0004-bcache-Move-couple-of-string-arrays-to-sysfs.c.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From fa0a21dfb8ab5be334eea2454406305ef6533269 Mon Sep 17 00:00:00 2001
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Fri, 4 May 2018 23:49:14 +0300
-Subject: [PATCH 4/6] bcache: Move couple of string arrays to sysfs.c
-
-There is couple of string arrays that are used exclusively in sysfs.c.
-Move it to there and make them static.
-
-Besides above, it will allow further clean up.
-
-No functional change intended.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Coly Li <colyli@suse.de>
----
- drivers/md/bcache/bcache.h |  2 --
- drivers/md/bcache/super.c  | 18 ------------------
- drivers/md/bcache/sysfs.c  | 18 ++++++++++++++++++
- 3 files changed, 18 insertions(+), 20 deletions(-)
-
-diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
-index a425fb49fd47..a84fd5c32e19 100644
---- a/drivers/md/bcache/bcache.h
-+++ b/drivers/md/bcache/bcache.h
-@@ -958,8 +958,6 @@ void bch_prio_write(struct cache *);
- void bch_write_bdev_super(struct cached_dev *, struct closure *);
- 
- extern struct workqueue_struct *bcache_wq;
--extern const char * const bch_cache_modes[];
--extern const char * const bch_stop_on_failure_modes[];
- extern struct mutex bch_register_lock;
- extern struct list_head bch_cache_sets;
- 
-diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
-index 53becf1facbd..ac1fc6dce9f9 100644
---- a/drivers/md/bcache/super.c
-+++ b/drivers/md/bcache/super.c
-@@ -37,24 +37,6 @@ static const char invalid_uuid[] = {
- 	0xc8, 0x50, 0xfc, 0x5e, 0xcb, 0x16, 0xcd, 0x99
- };
- 
--/* Default is -1; we skip past it for struct cached_dev's cache mode */
--const char * const bch_cache_modes[] = {
--	"default",
--	"writethrough",
--	"writeback",
--	"writearound",
--	"none",
--	NULL
--};
--
--/* Default is -1; we skip past it for stop_when_cache_set_failed */
--const char * const bch_stop_on_failure_modes[] = {
--	"default",
--	"auto",
--	"always",
--	NULL
--};
--
- static struct kobject *bcache_kobj;
- struct mutex bch_register_lock;
- LIST_HEAD(bch_cache_sets);
-diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
-index 6ef6616fb76e..70bc5e376a7e 100644
---- a/drivers/md/bcache/sysfs.c
-+++ b/drivers/md/bcache/sysfs.c
-@@ -16,6 +16,24 @@
- #include <linux/sort.h>
- #include <linux/sched/clock.h>
- 
-+/* Default is -1; we skip past it for struct cached_dev's cache mode */
-+static const char * const bch_cache_modes[] = {
-+	"default",
-+	"writethrough",
-+	"writeback",
-+	"writearound",
-+	"none",
-+	NULL
-+};
-+
-+/* Default is -1; we skip past it for stop_when_cache_set_failed */
-+static const char * const bch_stop_on_failure_modes[] = {
-+	"default",
-+	"auto",
-+	"always",
-+	NULL
-+};
-+
- static const char * const cache_replacement_policies[] = {
- 	"lru",
- 	"fifo",
--- 
-2.16.3
-
diff --git a/for-next/old/0005-bcache-Move-couple-of-functions-to-sysfs.c.patch b/for-next/old/0005-bcache-Move-couple-of-functions-to-sysfs.c.patch
deleted file mode 100644
index 4d007f5..0000000
--- a/for-next/old/0005-bcache-Move-couple-of-functions-to-sysfs.c.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 4d83a3fc219e6f8fbd7c493ff8b9212687efcf28 Mon Sep 17 00:00:00 2001
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Fri, 4 May 2018 23:49:15 +0300
-Subject: [PATCH 5/6] bcache: Move couple of functions to sysfs.c
-
-There is couple of functions that are used exclusively in sysfs.c.
-Move it to there and make them static.
-
-Besides above, it will allow further clean up.
-
-No functional change intended.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Coly Li <colyli@suse.de>
----
- drivers/md/bcache/sysfs.c | 35 +++++++++++++++++++++++++++++++++++
- drivers/md/bcache/util.c  | 35 -----------------------------------
- drivers/md/bcache/util.h  |  5 -----
- 3 files changed, 35 insertions(+), 40 deletions(-)
-
-diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
-index 70bc5e376a7e..09f77dc42648 100644
---- a/drivers/md/bcache/sysfs.c
-+++ b/drivers/md/bcache/sysfs.c
-@@ -132,6 +132,41 @@ rw_attribute(btree_shrinker_disabled);
- rw_attribute(copy_gc_enabled);
- rw_attribute(size);
- 
-+static ssize_t bch_snprint_string_list(char *buf, size_t size, const char * const list[],
-+			    size_t selected)
-+{
-+	char *out = buf;
-+	size_t i;
-+
-+	for (i = 0; list[i]; i++)
-+		out += snprintf(out, buf + size - out,
-+				i == selected ? "[%s] " : "%s ", list[i]);
-+
-+	out[-1] = '\n';
-+	return out - buf;
-+}
-+
-+static ssize_t bch_read_string_list(const char *buf, const char * const list[])
-+{
-+	size_t i;
-+	char *s, *d = kstrndup(buf, PAGE_SIZE - 1, GFP_KERNEL);
-+	if (!d)
-+		return -ENOMEM;
-+
-+	s = strim(d);
-+
-+	for (i = 0; list[i]; i++)
-+		if (!strcmp(list[i], s))
-+			break;
-+
-+	kfree(d);
-+
-+	if (!list[i])
-+		return -EINVAL;
-+
-+	return i;
-+}
-+
- SHOW(__bch_cached_dev)
- {
- 	struct cached_dev *dc = container_of(kobj, struct cached_dev,
-diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c
-index cdf822c0ac1b..f912c372978c 100644
---- a/drivers/md/bcache/util.c
-+++ b/drivers/md/bcache/util.c
-@@ -120,41 +120,6 @@ ssize_t bch_hprint(char *buf, int64_t v)
- 		return sprintf(buf, "%llu.%i%c", q, t * 10 / 1024, units[u]);
- }
- 
--ssize_t bch_snprint_string_list(char *buf, size_t size, const char * const list[],
--			    size_t selected)
--{
--	char *out = buf;
--	size_t i;
--
--	for (i = 0; list[i]; i++)
--		out += snprintf(out, buf + size - out,
--				i == selected ? "[%s] " : "%s ", list[i]);
--
--	out[-1] = '\n';
--	return out - buf;
--}
--
--ssize_t bch_read_string_list(const char *buf, const char * const list[])
--{
--	size_t i;
--	char *s, *d = kstrndup(buf, PAGE_SIZE - 1, GFP_KERNEL);
--	if (!d)
--		return -ENOMEM;
--
--	s = strim(d);
--
--	for (i = 0; list[i]; i++)
--		if (!strcmp(list[i], s))
--			break;
--
--	kfree(d);
--
--	if (!list[i])
--		return -EINVAL;
--
--	return i;
--}
--
- bool bch_is_zero(const char *p, size_t n)
- {
- 	size_t i;
-diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
-index bd70f1c6a176..091b4bf7cfc2 100644
---- a/drivers/md/bcache/util.h
-+++ b/drivers/md/bcache/util.h
-@@ -366,11 +366,6 @@ ssize_t bch_hprint(char *buf, int64_t v);
- bool bch_is_zero(const char *p, size_t n);
- int bch_parse_uuid(const char *s, char *uuid);
- 
--ssize_t bch_snprint_string_list(char *buf, size_t size, const char * const list[],
--			    size_t selected);
--
--ssize_t bch_read_string_list(const char *buf, const char * const list[]);
--
- struct time_stats {
- 	spinlock_t	lock;
- 	/*
--- 
-2.16.3
-
diff --git a/for-next/old/0006-bcache-Replace-bch_read_string_list-by-__sysfs_match.patch b/for-next/old/0006-bcache-Replace-bch_read_string_list-by-__sysfs_match.patch
deleted file mode 100644
index 8757c28..0000000
--- a/for-next/old/0006-bcache-Replace-bch_read_string_list-by-__sysfs_match.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 758be593b43d68b4d7a23a4d48722113ce4713b7 Mon Sep 17 00:00:00 2001
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Sat, 5 May 2018 20:59:09 +0800
-Subject: [PATCH 6/6] bcache: Replace bch_read_string_list() by
- __sysfs_match_string()
-
-Kernel library has a common function to match user input from sysfs
-against an array of strings. Thus, replace bch_read_string_list() by
-__sysfs_match_string().
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Coly Li <colyli@suse.de>
----
- drivers/md/bcache/sysfs.c | 44 +++++++++-----------------------------------
- 1 file changed, 9 insertions(+), 35 deletions(-)
-
-diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
-index 09f77dc42648..d02dcd6d5c50 100644
---- a/drivers/md/bcache/sysfs.c
-+++ b/drivers/md/bcache/sysfs.c
-@@ -18,7 +18,6 @@
- 
- /* Default is -1; we skip past it for struct cached_dev's cache mode */
- static const char * const bch_cache_modes[] = {
--	"default",
- 	"writethrough",
- 	"writeback",
- 	"writearound",
-@@ -28,7 +27,6 @@ static const char * const bch_cache_modes[] = {
- 
- /* Default is -1; we skip past it for stop_when_cache_set_failed */
- static const char * const bch_stop_on_failure_modes[] = {
--	"default",
- 	"auto",
- 	"always",
- 	NULL
-@@ -146,27 +144,6 @@ static ssize_t bch_snprint_string_list(char *buf, size_t size, const char * cons
- 	return out - buf;
- }
- 
--static ssize_t bch_read_string_list(const char *buf, const char * const list[])
--{
--	size_t i;
--	char *s, *d = kstrndup(buf, PAGE_SIZE - 1, GFP_KERNEL);
--	if (!d)
--		return -ENOMEM;
--
--	s = strim(d);
--
--	for (i = 0; list[i]; i++)
--		if (!strcmp(list[i], s))
--			break;
--
--	kfree(d);
--
--	if (!list[i])
--		return -EINVAL;
--
--	return i;
--}
--
- SHOW(__bch_cached_dev)
- {
- 	struct cached_dev *dc = container_of(kobj, struct cached_dev,
-@@ -178,12 +155,12 @@ SHOW(__bch_cached_dev)
- 
- 	if (attr == &sysfs_cache_mode)
- 		return bch_snprint_string_list(buf, PAGE_SIZE,
--					       bch_cache_modes + 1,
-+					       bch_cache_modes,
- 					       BDEV_CACHE_MODE(&dc->sb));
- 
- 	if (attr == &sysfs_stop_when_cache_set_failed)
- 		return bch_snprint_string_list(buf, PAGE_SIZE,
--					       bch_stop_on_failure_modes + 1,
-+					       bch_stop_on_failure_modes,
- 					       dc->stop_when_cache_set_failed);
- 
- 
-@@ -312,8 +289,7 @@ STORE(__cached_dev)
- 		bch_cached_dev_run(dc);
- 
- 	if (attr == &sysfs_cache_mode) {
--		v = bch_read_string_list(buf, bch_cache_modes + 1);
--
-+		v = __sysfs_match_string(bch_cache_modes, -1, buf);
- 		if (v < 0)
- 			return v;
- 
-@@ -324,8 +300,7 @@ STORE(__cached_dev)
- 	}
- 
- 	if (attr == &sysfs_stop_when_cache_set_failed) {
--		v = bch_read_string_list(buf, bch_stop_on_failure_modes + 1);
--
-+		v = __sysfs_match_string(bch_stop_on_failure_modes, -1, buf);
- 		if (v < 0)
- 			return v;
- 
-@@ -694,6 +669,7 @@ SHOW_LOCKED(bch_cache_set)
- STORE(__bch_cache_set)
- {
- 	struct cache_set *c = container_of(kobj, struct cache_set, kobj);
-+	ssize_t v;
- 
- 	if (attr == &sysfs_unregister)
- 		bch_cache_set_unregister(c);
-@@ -757,8 +733,7 @@ STORE(__bch_cache_set)
- 		      c->congested_write_threshold_us);
- 
- 	if (attr == &sysfs_errors) {
--		ssize_t v = bch_read_string_list(buf, error_actions);
--
-+		v = __sysfs_match_string(error_actions, -1, buf);
- 		if (v < 0)
- 			return v;
- 
-@@ -773,8 +748,7 @@ STORE(__bch_cache_set)
- 		c->error_decay = strtoul_or_return(buf) / 88;
- 
- 	if (attr == &sysfs_io_disable) {
--		int v = strtoul_or_return(buf);
--
-+		v = strtoul_or_return(buf);
- 		if (v) {
- 			if (test_and_set_bit(CACHE_SET_IO_DISABLE,
- 					     &c->flags))
-@@ -988,6 +962,7 @@ SHOW_LOCKED(bch_cache)
- STORE(__bch_cache)
- {
- 	struct cache *ca = container_of(kobj, struct cache, kobj);
-+	ssize_t v;
- 
- 	if (attr == &sysfs_discard) {
- 		bool v = strtoul_or_return(buf);
-@@ -1002,8 +977,7 @@ STORE(__bch_cache)
- 	}
- 
- 	if (attr == &sysfs_cache_replacement_policy) {
--		ssize_t v = bch_read_string_list(buf, cache_replacement_policies);
--
-+		v = __sysfs_match_string(cache_replacement_policies, -1, buf);
- 		if (v < 0)
- 			return v;
- 
--- 
-2.16.3
-