drop 2 broken patches

4 files changed, 1 insertions, 274 deletions

diff --git a/dm-thin-flush-data-device-before-committing-metadata.patch b/dm-thin-flush-data-device-before-committing-metadata.patch
deleted file mode 100644
index 4dfcf86..0000000
--- a/dm-thin-flush-data-device-before-committing-metadata.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 694cfe7f31db36912725e63a38a5179c8628a496 Mon Sep 17 00:00:00 2001
-From: Nikos Tsironis <ntsironis@arrikto.com>
-Date: Wed, 4 Dec 2019 16:07:42 +0200
-Subject: dm thin: Flush data device before committing metadata
-
-From: Nikos Tsironis <ntsironis@arrikto.com>
-
-commit 694cfe7f31db36912725e63a38a5179c8628a496 upstream.
-
-The thin provisioning target maintains per thin device mappings that map
-virtual blocks to data blocks in the data device.
-
-When we write to a shared block, in case of internal snapshots, or
-provision a new block, in case of external snapshots, we copy the shared
-block to a new data block (COW), update the mapping for the relevant
-virtual block and then issue the write to the new data block.
-
-Suppose the data device has a volatile write-back cache and the
-following sequence of events occur:
-
-1. We write to a shared block
-2. A new data block is allocated
-3. We copy the shared block to the new data block using kcopyd (COW)
-4. We insert the new mapping for the virtual block in the btree for that
-   thin device.
-5. The commit timeout expires and we commit the metadata, that now
-   includes the new mapping from step (4).
-6. The system crashes and the data device's cache has not been flushed,
-   meaning that the COWed data are lost.
-
-The next time we read that virtual block of the thin device we read it
-from the data block allocated in step (2), since the metadata have been
-successfully committed. The data are lost due to the crash, so we read
-garbage instead of the old, shared data.
-
-This has the following implications:
-
-1. In case of writes to shared blocks, with size smaller than the pool's
-   block size (which means we first copy the whole block and then issue
-   the smaller write), we corrupt data that the user never touched.
-
-2. In case of writes to shared blocks, with size equal to the device's
-   logical block size, we fail to provide atomic sector writes. When the
-   system recovers the user will read garbage from that sector instead
-   of the old data or the new data.
-
-3. Even for writes to shared blocks, with size equal to the pool's block
-   size (overwrites), after the system recovers, the written sectors
-   will contain garbage instead of a random mix of sectors containing
-   either old data or new data, thus we fail again to provide atomic
-   sectors writes.
-
-4. Even when the user flushes the thin device, because we first commit
-   the metadata and then pass down the flush, the same risk for
-   corruption exists (if the system crashes after the metadata have been
-   committed but before the flush is passed down to the data device.)
-
-The only case which is unaffected is that of writes with size equal to
-the pool's block size and with the FUA flag set. But, because FUA writes
-trigger metadata commits, this case can trigger the corruption
-indirectly.
-
-Moreover, apart from internal and external snapshots, the same issue
-exists for newly provisioned blocks, when block zeroing is enabled.
-After the system recovers the provisioned blocks might contain garbage
-instead of zeroes.
-
-To solve this and avoid the potential data corruption we flush the
-pool's data device **before** committing its metadata.
-
-This ensures that the data blocks of any newly inserted mappings are
-properly written to non-volatile storage and won't be lost in case of a
-crash.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Nikos Tsironis <ntsironis@arrikto.com>
-Acked-by: Joe Thornber <ejt@redhat.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/md/dm-thin.c |   42 ++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 40 insertions(+), 2 deletions(-)
-
---- a/drivers/md/dm-thin.c
-+++ b/drivers/md/dm-thin.c
-@@ -224,6 +224,7 @@ struct pool_c {
- 	dm_block_t low_water_blocks;
- 	struct pool_features requested_pf; /* Features requested during table load */
- 	struct pool_features adjusted_pf;  /* Features used after adjusting for constituent devices */
-+	struct bio flush_bio;
- };
- 
- /*
-@@ -1720,8 +1721,16 @@ static void process_deferred_bios(struct
- 	}
- 	pool->last_commit_jiffies = jiffies;
- 
--	while ((bio = bio_list_pop(&bios)))
--		generic_make_request(bio);
-+	while ((bio = bio_list_pop(&bios))) {
-+		/*
-+		 * The data device was flushed as part of metadata commit,
-+		 * so complete redundant flushes immediately.
-+		 */
-+		if (bio->bi_opf & REQ_PREFLUSH)
-+			bio_endio(bio);
-+		else
-+			generic_make_request(bio);
-+	}
- }
- 
- static void do_worker(struct work_struct *ws)
-@@ -2404,6 +2413,7 @@ static void pool_dtr(struct dm_target *t
- 	__pool_dec(pt->pool);
- 	dm_put_device(ti, pt->metadata_dev);
- 	dm_put_device(ti, pt->data_dev);
-+	bio_uninit(&pt->flush_bio);
- 	kfree(pt);
- 
- 	mutex_unlock(&dm_thin_pool_table.mutex);
-@@ -2469,6 +2479,29 @@ static void metadata_low_callback(void *
- 	dm_table_event(pool->ti->table);
- }
- 
-+/*
-+ * We need to flush the data device **before** committing the metadata.
-+ *
-+ * This ensures that the data blocks of any newly inserted mappings are
-+ * properly written to non-volatile storage and won't be lost in case of a
-+ * crash.
-+ *
-+ * Failure to do so can result in data corruption in the case of internal or
-+ * external snapshots and in the case of newly provisioned blocks, when block
-+ * zeroing is enabled.
-+ */
-+static int metadata_pre_commit_callback(void *context)
-+{
-+	struct pool_c *pt = context;
-+	struct bio *flush_bio = &pt->flush_bio;
-+
-+	bio_reset(flush_bio);
-+	bio_set_dev(flush_bio, pt->data_dev->bdev);
-+	flush_bio->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;
-+
-+	return submit_bio_wait(flush_bio);
-+}
-+
- static sector_t get_dev_size(struct block_device *bdev)
- {
- 	return i_size_read(bdev->bd_inode) >> SECTOR_SHIFT;
-@@ -2637,6 +2670,7 @@ static int pool_ctr(struct dm_target *ti
- 	pt->data_dev = data_dev;
- 	pt->low_water_blocks = low_water_blocks;
- 	pt->adjusted_pf = pt->requested_pf = pf;
-+	bio_init(&pt->flush_bio, NULL, 0);
- 	ti->num_flush_bios = 1;
- 
- 	/*
-@@ -2664,6 +2698,10 @@ static int pool_ctr(struct dm_target *ti
- 	if (r)
- 		goto out_flags_changed;
- 
-+	dm_pool_register_pre_commit_callback(pt->pool->pmd,
-+					     metadata_pre_commit_callback,
-+					     pt);
-+
- 	pt->callbacks.congested_fn = pool_is_congested;
- 	dm_table_add_target_callbacks(ti->table, &pt->callbacks);
- 
diff --git a/dm-thin-metadata-add-support-for-a-pre-commit-callback.patch b/dm-thin-metadata-add-support-for-a-pre-commit-callback.patch
deleted file mode 100644
index 84421b0..0000000
--- a/dm-thin-metadata-add-support-for-a-pre-commit-callback.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From ecda7c0280e6b3398459dc589b9a41c1adb45529 Mon Sep 17 00:00:00 2001
-From: Nikos Tsironis <ntsironis@arrikto.com>
-Date: Wed, 4 Dec 2019 16:07:41 +0200
-Subject: dm thin metadata: Add support for a pre-commit callback
-
-From: Nikos Tsironis <ntsironis@arrikto.com>
-
-commit ecda7c0280e6b3398459dc589b9a41c1adb45529 upstream.
-
-Add support for one pre-commit callback which is run right before the
-metadata are committed.
-
-This allows the thin provisioning target to run a callback before the
-metadata are committed and is required by the next commit.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Nikos Tsironis <ntsironis@arrikto.com>
-Acked-by: Joe Thornber <ejt@redhat.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/md/dm-thin-metadata.c |   29 +++++++++++++++++++++++++++++
- drivers/md/dm-thin-metadata.h |    7 +++++++
- 2 files changed, 36 insertions(+)
-
---- a/drivers/md/dm-thin-metadata.c
-+++ b/drivers/md/dm-thin-metadata.c
-@@ -191,6 +191,15 @@ struct dm_pool_metadata {
- 	bool read_only:1;
- 
- 	/*
-+	 * Pre-commit callback.
-+	 *
-+	 * This allows the thin provisioning target to run a callback before
-+	 * the metadata are committed.
-+	 */
-+	dm_pool_pre_commit_fn pre_commit_fn;
-+	void *pre_commit_context;
-+
-+	/*
- 	 * We reserve a section of the metadata for commit overhead.
- 	 * All reported space does *not* include this.
- 	 */
-@@ -790,6 +799,14 @@ static int __commit_transaction(struct d
- 	 */
- 	BUILD_BUG_ON(sizeof(struct thin_disk_superblock) > 512);
- 
-+	if (pmd->pre_commit_fn) {
-+		r = pmd->pre_commit_fn(pmd->pre_commit_context);
-+		if (r < 0) {
-+			DMERR("pre-commit callback failed");
-+			return r;
-+		}
-+	}
-+
- 	r = __write_changed_details(pmd);
- 	if (r < 0)
- 		return r;
-@@ -864,6 +881,8 @@ struct dm_pool_metadata *dm_pool_metadat
- 	pmd->fail_io = false;
- 	pmd->bdev = bdev;
- 	pmd->data_block_size = data_block_size;
-+	pmd->pre_commit_fn = NULL;
-+	pmd->pre_commit_context = NULL;
- 
- 	r = __create_persistent_data_objects(pmd, format_device);
- 	if (r) {
-@@ -1815,6 +1834,16 @@ int dm_pool_register_metadata_threshold(
- 	return r;
- }
- 
-+void dm_pool_register_pre_commit_callback(struct dm_pool_metadata *pmd,
-+					  dm_pool_pre_commit_fn fn,
-+					  void *context)
-+{
-+	pmd_write_lock_in_core(pmd);
-+	pmd->pre_commit_fn = fn;
-+	pmd->pre_commit_context = context;
-+	pmd_write_unlock(pmd);
-+}
-+
- int dm_pool_metadata_set_needs_check(struct dm_pool_metadata *pmd)
- {
- 	int r;
---- a/drivers/md/dm-thin-metadata.h
-+++ b/drivers/md/dm-thin-metadata.h
-@@ -213,6 +213,13 @@ int dm_pool_register_metadata_threshold(
- int dm_pool_metadata_set_needs_check(struct dm_pool_metadata *pmd);
- bool dm_pool_metadata_needs_check(struct dm_pool_metadata *pmd);
- 
-+/* Pre-commit callback */
-+typedef int (*dm_pool_pre_commit_fn)(void *context);
-+
-+void dm_pool_register_pre_commit_callback(struct dm_pool_metadata *pmd,
-+					  dm_pool_pre_commit_fn fn,
-+					  void *context);
-+
- /*----------------------------------------------------------------*/
- 
- #endif
diff --git a/mm-shmem.c-cast-the-type-of-unmap_start-to-u64.patch b/mm-shmem.c-cast-the-type-of-unmap_start-to-u64.patch
index 5cdd8fd..3f67e3d 100644
--- a/mm-shmem.c-cast-the-type-of-unmap_start-to-u64.patch
+++ b/mm-shmem.c-cast-the-type-of-unmap_start-to-u64.patch
@@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
-@@ -2077,7 +2077,7 @@ static long shmem_fallocate(struct file
+@@ -2079,7 +2079,7 @@ static long shmem_fallocate(struct file
  		}
  
  		shmem_falloc.waitq = &shmem_falloc_waitq;
diff --git a/series b/series
index 99359ac..11c6426 100644
--- a/series
+++ b/series
@@ -57,8 +57,6 @@ cifs-respect-o_sync-and-o_direct-flags-during-reconnect.patch
 arm-dts-s3c64xx-fix-init-order-of-clock-providers.patch
 arm-tegra-fix-flow_ctlr_halt-register-clobbering-by-tegra_resume.patch
 dm-btree-increase-rebalance-threshold-in-__rebalance2.patch
-dm-thin-metadata-add-support-for-a-pre-commit-callback.patch
-dm-thin-flush-data-device-before-committing-metadata.patch
 drm-radeon-fix-r1xx-r2xx-register-checker-for-pot-textures.patch
 
 # newer stuff