From 9e43c41b8f1fa9a0685d8c9c36fafa706bc15171 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Jul 2020 07:39:06 +0200 Subject: [PATCH] fuzz cleanup --- ...ty-recalculation-that-is-improperly-skipped.patch | 12 ++++++------ ...ty-recalculation-that-is-improperly-skipped.patch | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/queue-5.4/dm-integrity-fix-integrity-recalculation-that-is-improperly-skipped.patch b/queue-5.4/dm-integrity-fix-integrity-recalculation-that-is-improperly-skipped.patch index a0d02a00c63..93375ae17af 100644 --- a/queue-5.4/dm-integrity-fix-integrity-recalculation-that-is-improperly-skipped.patch +++ b/queue-5.4/dm-integrity-fix-integrity-recalculation-that-is-improperly-skipped.patch @@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman #define DM_NUMA_NODE NUMA_NO_NODE static int dm_numa_node = DM_NUMA_NODE; -@@ -2377,6 +2378,7 @@ static void __dm_destroy(struct mapped_d +@@ -2390,6 +2391,7 @@ static void __dm_destroy(struct mapped_d if (!dm_suspended_md(md)) { dm_table_presuspend_targets(map); set_bit(DMF_SUSPENDED, &md->flags); @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman dm_table_postsuspend_targets(map); } /* dm_put_live_table must be before msleep, otherwise deadlock is possible */ -@@ -2735,7 +2737,9 @@ retry: +@@ -2712,7 +2714,9 @@ retry: if (r) goto out_unlock; @@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman out_unlock: mutex_unlock(&md->suspend_lock); -@@ -2832,7 +2836,9 @@ static void __dm_internal_suspend(struct +@@ -2809,7 +2813,9 @@ static void __dm_internal_suspend(struct (void) __dm_suspend(md, map, suspend_flags, TASK_UNINTERRUPTIBLE, DMF_SUSPENDED_INTERNALLY); @@ -91,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman } static void __dm_internal_resume(struct mapped_device *md) -@@ -2993,6 +2999,11 @@ int dm_suspended_md(struct mapped_device +@@ -2970,6 +2976,11 @@ int dm_suspended_md(struct mapped_device return test_bit(DMF_SUSPENDED, &md->flags); } @@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman int dm_suspended_internally_md(struct mapped_device *md) { return test_bit(DMF_SUSPENDED_INTERNALLY, &md->flags); -@@ -3009,6 +3020,12 @@ int dm_suspended(struct dm_target *ti) +@@ -2986,6 +2997,12 @@ int dm_suspended(struct dm_target *ti) } EXPORT_SYMBOL_GPL(dm_suspended); @@ -118,7 +118,7 @@ Signed-off-by: Greg Kroah-Hartman return __noflush_suspending(dm_table_get_md(ti->table)); --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h -@@ -422,6 +422,7 @@ const char *dm_device_name(struct mapped +@@ -420,6 +420,7 @@ const char *dm_device_name(struct mapped int dm_copy_name_and_uuid(struct mapped_device *md, char *name, char *uuid); struct gendisk *dm_disk(struct mapped_device *md); int dm_suspended(struct dm_target *ti); diff --git a/queue-5.7/dm-integrity-fix-integrity-recalculation-that-is-improperly-skipped.patch b/queue-5.7/dm-integrity-fix-integrity-recalculation-that-is-improperly-skipped.patch index c5f9f8028e8..a2a93562955 100644 --- a/queue-5.7/dm-integrity-fix-integrity-recalculation-that-is-improperly-skipped.patch +++ b/queue-5.7/dm-integrity-fix-integrity-recalculation-that-is-improperly-skipped.patch @@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman #define DM_NUMA_NODE NUMA_NO_NODE static int dm_numa_node = DM_NUMA_NODE; -@@ -2385,6 +2386,7 @@ static void __dm_destroy(struct mapped_d +@@ -2398,6 +2399,7 @@ static void __dm_destroy(struct mapped_d if (!dm_suspended_md(md)) { dm_table_presuspend_targets(map); set_bit(DMF_SUSPENDED, &md->flags); @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman dm_table_postsuspend_targets(map); } /* dm_put_live_table must be before msleep, otherwise deadlock is possible */ -@@ -2743,7 +2745,9 @@ retry: +@@ -2720,7 +2722,9 @@ retry: if (r) goto out_unlock; @@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman out_unlock: mutex_unlock(&md->suspend_lock); -@@ -2840,7 +2844,9 @@ static void __dm_internal_suspend(struct +@@ -2817,7 +2821,9 @@ static void __dm_internal_suspend(struct (void) __dm_suspend(md, map, suspend_flags, TASK_UNINTERRUPTIBLE, DMF_SUSPENDED_INTERNALLY); @@ -91,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman } static void __dm_internal_resume(struct mapped_device *md) -@@ -3001,6 +3007,11 @@ int dm_suspended_md(struct mapped_device +@@ -2978,6 +2984,11 @@ int dm_suspended_md(struct mapped_device return test_bit(DMF_SUSPENDED, &md->flags); } @@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman int dm_suspended_internally_md(struct mapped_device *md) { return test_bit(DMF_SUSPENDED_INTERNALLY, &md->flags); -@@ -3017,6 +3028,12 @@ int dm_suspended(struct dm_target *ti) +@@ -2994,6 +3005,12 @@ int dm_suspended(struct dm_target *ti) } EXPORT_SYMBOL_GPL(dm_suspended); @@ -118,7 +118,7 @@ Signed-off-by: Greg Kroah-Hartman return __noflush_suspending(dm_table_get_md(ti->table)); --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h -@@ -426,6 +426,7 @@ const char *dm_device_name(struct mapped +@@ -424,6 +424,7 @@ const char *dm_device_name(struct mapped int dm_copy_name_and_uuid(struct mapped_device *md, char *name, char *uuid); struct gendisk *dm_disk(struct mapped_device *md); int dm_suspended(struct dm_target *ti); -- 2.47.3