fuzz cleanups

diff --git a/queue-4.19/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch b/queue-4.19/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch
index 97b3df3738b8bbba7f26e788dec87f23cbe8575c..abc6117c37c380c6a2d53f254b536867192a56d1 100644 (file)
--- a/queue-4.19/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch
+++ b/queue-4.19/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch
@@ -22,14 +22,12 @@ Link: https://lore.kernel.org/r/20200616131808.GA1040@lca.pw
 Signed-off-by: Will Deacon <will@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- arch/arm64/kernel/fpsimd.c | 6 +++---
+ arch/arm64/kernel/fpsimd.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
-index af59b42973141..177363abbd3e3 100644
 --- a/arch/arm64/kernel/fpsimd.c
 +++ b/arch/arm64/kernel/fpsimd.c
-@@ -315,7 +315,7 @@ static unsigned int find_supported_vector_length(unsigned int vl)
+@@ -304,7 +304,7 @@ static unsigned int find_supported_vecto
        return sve_vl_from_vq(bit_to_vq(bit));
  }
  
@@ -38,7 +36,7 @@ index af59b42973141..177363abbd3e3 100644
  
  static int sve_proc_do_default_vl(struct ctl_table *table, int write,
                                  void __user *buffer, size_t *lenp,
-@@ -361,9 +361,9 @@ static int __init sve_sysctl_init(void)
+@@ -350,9 +350,9 @@ static int __init sve_sysctl_init(void)
        return 0;
  }
  
@@ -50,6 +48,3 @@ index af59b42973141..177363abbd3e3 100644
  
  #define ZREG(sve_state, vq, n) ((char *)(sve_state) +         \
        (SVE_SIG_ZREG_OFFSET(vq, n) - SVE_SIG_REGS_OFFSET))
--- 
-2.25.1
-

diff --git a/queue-5.4/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch b/queue-5.4/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch
index 3a069539e4c40afd4b909a3ddde3ca1176066d6a..2f1fd6621f953b0ee0144fdb5ce55a94ebda68bf 100644 (file)
--- a/queue-5.4/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch
+++ b/queue-5.4/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch
@@ -22,14 +22,12 @@ Link: https://lore.kernel.org/r/20200616131808.GA1040@lca.pw
 Signed-off-by: Will Deacon <will@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- arch/arm64/kernel/fpsimd.c | 6 +++---
+ arch/arm64/kernel/fpsimd.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
-index d8895251a2aac..338e0966d3ca2 100644
 --- a/arch/arm64/kernel/fpsimd.c
 +++ b/arch/arm64/kernel/fpsimd.c
-@@ -349,7 +349,7 @@ static unsigned int find_supported_vector_length(unsigned int vl)
+@@ -338,7 +338,7 @@ static unsigned int find_supported_vecto
        return sve_vl_from_vq(__bit_to_vq(bit));
  }
  
@@ -38,7 +36,7 @@ index d8895251a2aac..338e0966d3ca2 100644
  
  static int sve_proc_do_default_vl(struct ctl_table *table, int write,
                                  void __user *buffer, size_t *lenp,
-@@ -395,9 +395,9 @@ static int __init sve_sysctl_init(void)
+@@ -384,9 +384,9 @@ static int __init sve_sysctl_init(void)
        return 0;
  }
  
@@ -50,6 +48,3 @@ index d8895251a2aac..338e0966d3ca2 100644
  
  #define ZREG(sve_state, vq, n) ((char *)(sve_state) +         \
        (SVE_SIG_ZREG_OFFSET(vq, n) - SVE_SIG_REGS_OFFSET))
--- 
-2.25.1
-

diff --git a/queue-5.4/nvme-don-t-protect-ns-mutation-with-ns-head-lock.patch b/queue-5.4/nvme-don-t-protect-ns-mutation-with-ns-head-lock.patch
index 8152ff55d766d52b5c806ade1bdf6ede28d15da8..11e864ea356ed209876a693466f37c1a0fb94dae 100644 (file)
--- a/queue-5.4/nvme-don-t-protect-ns-mutation-with-ns-head-lock.patch
+++ b/queue-5.4/nvme-don-t-protect-ns-mutation-with-ns-head-lock.patch
@@ -28,14 +28,12 @@ Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
 Signed-off-by: Christoph Hellwig <hch@lst.de>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/nvme/host/multipath.c | 12 ++++--------
+ drivers/nvme/host/multipath.c |   12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index 0f08c15553a64..18f0a05c74b56 100644
 --- a/drivers/nvme/host/multipath.c
 +++ b/drivers/nvme/host/multipath.c
-@@ -414,11 +414,10 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)
+@@ -413,11 +413,10 @@ static void nvme_mpath_set_live(struct n
  {
        struct nvme_ns_head *head = ns->head;
  
@@ -48,7 +46,7 @@ index 0f08c15553a64..18f0a05c74b56 100644
        if (!(head->disk->flags & GENHD_FL_UP))
                device_add_disk(&head->subsys->dev, head->disk,
                                nvme_ns_id_attr_groups);
-@@ -431,9 +430,10 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)
+@@ -430,9 +429,10 @@ static void nvme_mpath_set_live(struct n
                        __nvme_find_path(head, node);
                srcu_read_unlock(&head->srcu, srcu_idx);
        }
@@ -61,7 +59,7 @@ index 0f08c15553a64..18f0a05c74b56 100644
  }
  
  static int nvme_parse_ana_log(struct nvme_ctrl *ctrl, void *data,
-@@ -484,14 +484,12 @@ static inline bool nvme_state_is_live(enum nvme_ana_state state)
+@@ -483,14 +483,12 @@ static inline bool nvme_state_is_live(en
  static void nvme_update_ns_ana_state(struct nvme_ana_group_desc *desc,
                struct nvme_ns *ns)
  {
@@ -76,17 +74,14 @@ index 0f08c15553a64..18f0a05c74b56 100644
  }
  
  static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
-@@ -670,10 +668,8 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id)
-                       nvme_update_ns_ana_state(&desc, ns);
-               }
+@@ -661,10 +659,8 @@ void nvme_mpath_add_disk(struct nvme_ns
+               nvme_parse_ana_log(ns->ctrl, ns, nvme_set_ns_ana_state);
+               mutex_unlock(&ns->ctrl->ana_lock);
        } else {
 -              mutex_lock(&ns->head->lock);
                ns->ana_state = NVME_ANA_OPTIMIZED; 
                nvme_mpath_set_live(ns);
 -              mutex_unlock(&ns->head->lock);
        }
+ }
  
-       if (bdi_cap_stable_pages_required(ns->queue->backing_dev_info)) {
--- 
-2.25.1
-

diff --git a/queue-5.7/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch b/queue-5.7/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch
index 49984715389b5e5e708a5f47e3c9ec4db6aead64..cc24e3f8188f53679952d4f746d0faade084b47b 100644 (file)
--- a/queue-5.7/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch
+++ b/queue-5.7/arm64-sve-fix-build-failure-when-arm64_sve-y-and-sys.patch
@@ -22,14 +22,12 @@ Link: https://lore.kernel.org/r/20200616131808.GA1040@lca.pw
 Signed-off-by: Will Deacon <will@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- arch/arm64/kernel/fpsimd.c | 6 +++---
+ arch/arm64/kernel/fpsimd.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
-index 4a77263c183b3..befc5a715dc4e 100644
 --- a/arch/arm64/kernel/fpsimd.c
 +++ b/arch/arm64/kernel/fpsimd.c
-@@ -349,7 +349,7 @@ static unsigned int find_supported_vector_length(unsigned int vl)
+@@ -338,7 +338,7 @@ static unsigned int find_supported_vecto
        return sve_vl_from_vq(__bit_to_vq(bit));
  }
  
@@ -38,7 +36,7 @@ index 4a77263c183b3..befc5a715dc4e 100644
  
  static int sve_proc_do_default_vl(struct ctl_table *table, int write,
                                  void __user *buffer, size_t *lenp,
-@@ -395,9 +395,9 @@ static int __init sve_sysctl_init(void)
+@@ -384,9 +384,9 @@ static int __init sve_sysctl_init(void)
        return 0;
  }
  
@@ -50,6 +48,3 @@ index 4a77263c183b3..befc5a715dc4e 100644
  
  #define ZREG(sve_state, vq, n) ((char *)(sve_state) +         \
        (SVE_SIG_ZREG_OFFSET(vq, n) - SVE_SIG_REGS_OFFSET))
--- 
-2.25.1
-

diff --git a/queue-5.7/nvme-don-t-protect-ns-mutation-with-ns-head-lock.patch b/queue-5.7/nvme-don-t-protect-ns-mutation-with-ns-head-lock.patch
index 98e64f14dad0524ca035dd56c4c949b833e1a0b9..5969c0f1e1640ee5202d0445ed403a27c43d9abc 100644 (file)
--- a/queue-5.7/nvme-don-t-protect-ns-mutation-with-ns-head-lock.patch
+++ b/queue-5.7/nvme-don-t-protect-ns-mutation-with-ns-head-lock.patch
@@ -28,14 +28,12 @@ Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
 Signed-off-by: Christoph Hellwig <hch@lst.de>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/nvme/host/multipath.c | 12 ++++--------
+ drivers/nvme/host/multipath.c |   12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index fece4654fa3e7..f4287d8550a9f 100644
 --- a/drivers/nvme/host/multipath.c
 +++ b/drivers/nvme/host/multipath.c
-@@ -410,11 +410,10 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)
+@@ -409,11 +409,10 @@ static void nvme_mpath_set_live(struct n
  {
        struct nvme_ns_head *head = ns->head;
  
@@ -48,7 +46,7 @@ index fece4654fa3e7..f4287d8550a9f 100644
        if (!(head->disk->flags & GENHD_FL_UP))
                device_add_disk(&head->subsys->dev, head->disk,
                                nvme_ns_id_attr_groups);
-@@ -427,9 +426,10 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)
+@@ -426,9 +425,10 @@ static void nvme_mpath_set_live(struct n
                        __nvme_find_path(head, node);
                srcu_read_unlock(&head->srcu, srcu_idx);
        }
@@ -61,7 +59,7 @@ index fece4654fa3e7..f4287d8550a9f 100644
  }
  
  static int nvme_parse_ana_log(struct nvme_ctrl *ctrl, void *data,
-@@ -484,14 +484,12 @@ static inline bool nvme_state_is_live(enum nvme_ana_state state)
+@@ -483,14 +483,12 @@ static inline bool nvme_state_is_live(en
  static void nvme_update_ns_ana_state(struct nvme_ana_group_desc *desc,
                struct nvme_ns *ns)
  {
@@ -76,17 +74,14 @@ index fece4654fa3e7..f4287d8550a9f 100644
  }
  
  static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
-@@ -670,10 +668,8 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id)
-                       nvme_update_ns_ana_state(&desc, ns);
-               }
+@@ -661,10 +659,8 @@ void nvme_mpath_add_disk(struct nvme_ns
+               nvme_parse_ana_log(ns->ctrl, ns, nvme_set_ns_ana_state);
+               mutex_unlock(&ns->ctrl->ana_lock);
        } else {
 -              mutex_lock(&ns->head->lock);
                ns->ana_state = NVME_ANA_OPTIMIZED; 
                nvme_mpath_set_live(ns);
 -              mutex_unlock(&ns->head->lock);
        }
+ }
  
-       if (bdi_cap_stable_pages_required(ns->queue->backing_dev_info)) {
--- 
-2.25.1
-