fuzz cleanup

diff --git a/queue-5.15/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch b/queue-5.15/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch
index cf8da236dd297bcebb5ba80d6288ced5ab0aad4f..39cef73a642ca27f137c8a092d3e55301286a729 100644 (file)
--- a/queue-5.15/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch
+++ b/queue-5.15/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch
@@ -37,14 +37,12 @@ Reviewed-by: Jiri Olsa <jolsa@kernel.org>
 Link: https://lore.kernel.org/bpf/20240714065533.1112616-1-houtao@huaweicloud.com
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- kernel/events/core.c | 28 +++++++++++++---------------
- 1 file changed, 13 insertions(+), 15 deletions(-)
+ kernel/events/core.c |   26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
 
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index b689b35473a38..ce6f9052d4bc4 100644
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -9168,21 +9168,19 @@ static void perf_event_bpf_emit_ksymbols(struct bpf_prog *prog,
+@@ -9194,21 +9194,19 @@ static void perf_event_bpf_emit_ksymbols
        bool unregister = type == PERF_BPF_EVENT_PROG_UNLOAD;
        int i;
  
@@ -56,18 +54,17 @@ index b689b35473a38..ce6f9052d4bc4 100644
 -      } else {
 -              for (i = 0; i < prog->aux->func_cnt; i++) {
 -                      struct bpf_prog *subprog = prog->aux->func[i];
--
++      perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_BPF,
++                         (u64)(unsigned long)prog->bpf_func,
++                         prog->jited_len, unregister,
++                         prog->aux->ksym.name);
+ 
 -                      perf_event_ksymbol(
 -                              PERF_RECORD_KSYMBOL_TYPE_BPF,
 -                              (u64)(unsigned long)subprog->bpf_func,
 -                              subprog->jited_len, unregister,
 -                              subprog->aux->ksym.name);
 -              }
-+      perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_BPF,
-+                         (u64)(unsigned long)prog->bpf_func,
-+                         prog->jited_len, unregister,
-+                         prog->aux->ksym.name);
-+
 +      for (i = 1; i < prog->aux->func_cnt; i++) {
 +              struct bpf_prog *subprog = prog->aux->func[i];
 +
@@ -79,6 +76,3 @@ index b689b35473a38..ce6f9052d4bc4 100644
        }
  }
  
--- 
-2.43.0
-

diff --git a/queue-6.10/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch b/queue-6.10/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch
index cd595550917f121c879e31d887d6c195235e55d8..44f5b37fb98a8c728d76057222ffebed9c7222b6 100644 (file)
--- a/queue-6.10/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch
+++ b/queue-6.10/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch
@@ -37,14 +37,12 @@ Reviewed-by: Jiri Olsa <jolsa@kernel.org>
 Link: https://lore.kernel.org/bpf/20240714065533.1112616-1-houtao@huaweicloud.com
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- kernel/events/core.c | 28 +++++++++++++---------------
- 1 file changed, 13 insertions(+), 15 deletions(-)
+ kernel/events/core.c |   26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
 
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 053e546d5bf07..af77bbebd7004 100644
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -9304,21 +9304,19 @@ static void perf_event_bpf_emit_ksymbols(struct bpf_prog *prog,
+@@ -9330,21 +9330,19 @@ static void perf_event_bpf_emit_ksymbols
        bool unregister = type == PERF_BPF_EVENT_PROG_UNLOAD;
        int i;
  
@@ -56,18 +54,17 @@ index 053e546d5bf07..af77bbebd7004 100644
 -      } else {
 -              for (i = 0; i < prog->aux->func_cnt; i++) {
 -                      struct bpf_prog *subprog = prog->aux->func[i];
--
++      perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_BPF,
++                         (u64)(unsigned long)prog->bpf_func,
++                         prog->jited_len, unregister,
++                         prog->aux->ksym.name);
+ 
 -                      perf_event_ksymbol(
 -                              PERF_RECORD_KSYMBOL_TYPE_BPF,
 -                              (u64)(unsigned long)subprog->bpf_func,
 -                              subprog->jited_len, unregister,
 -                              subprog->aux->ksym.name);
 -              }
-+      perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_BPF,
-+                         (u64)(unsigned long)prog->bpf_func,
-+                         prog->jited_len, unregister,
-+                         prog->aux->ksym.name);
-+
 +      for (i = 1; i < prog->aux->func_cnt; i++) {
 +              struct bpf_prog *subprog = prog->aux->func[i];
 +
@@ -79,6 +76,3 @@ index 053e546d5bf07..af77bbebd7004 100644
        }
  }
  
--- 
-2.43.0
-

diff --git a/queue-6.10/f2fs-fix-to-truncate-preallocated-blocks-in-f2fs_fil.patch b/queue-6.10/f2fs-fix-to-truncate-preallocated-blocks-in-f2fs_fil.patch
index 04c021a10e766235b9cf38c005590538969dc7e5..e3a519cd5a1282b22e6a6cce747f7b5da2439903 100644 (file)
--- a/queue-6.10/f2fs-fix-to-truncate-preallocated-blocks-in-f2fs_fil.patch
+++ b/queue-6.10/f2fs-fix-to-truncate-preallocated-blocks-in-f2fs_fil.patch
@@ -55,13 +55,11 @@ Signed-off-by: Chao Yu <chao@kernel.org>
 Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- fs/f2fs/f2fs.h  |  1 +
- fs/f2fs/file.c  | 42 +++++++++++++++++++++++++++++++++++++++++-
- fs/f2fs/inode.c |  8 --------
+ fs/f2fs/f2fs.h  |    1 +
+ fs/f2fs/file.c  |   42 +++++++++++++++++++++++++++++++++++++++++-
+ fs/f2fs/inode.c |    8 --------
  3 files changed, 42 insertions(+), 9 deletions(-)
 
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index 1974b6aff397c..9ae36ef674a26 100644
 --- a/fs/f2fs/f2fs.h
 +++ b/fs/f2fs/f2fs.h
 @@ -803,6 +803,7 @@ enum {
@@ -72,11 +70,9 @@ index 1974b6aff397c..9ae36ef674a26 100644
        FI_MAX,                 /* max flag, never be used */
  };
  
-diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
-index 5c0b281a70f3e..d35190994a677 100644
 --- a/fs/f2fs/file.c
 +++ b/fs/f2fs/file.c
-@@ -554,6 +554,42 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -554,6 +554,42 @@ static int f2fs_file_mmap(struct file *f
        return 0;
  }
  
@@ -119,7 +115,7 @@ index 5c0b281a70f3e..d35190994a677 100644
  static int f2fs_file_open(struct inode *inode, struct file *filp)
  {
        int err = fscrypt_file_open(inode, filp);
-@@ -571,7 +607,11 @@ static int f2fs_file_open(struct inode *inode, struct file *filp)
+@@ -571,7 +607,11 @@ static int f2fs_file_open(struct inode *
        filp->f_mode |= FMODE_NOWAIT;
        filp->f_mode |= FMODE_CAN_ODIRECT;
  
@@ -132,11 +128,9 @@ index 5c0b281a70f3e..d35190994a677 100644
  }
  
  void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)
-diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
-index 005dde72aff3d..791c06e159fd2 100644
 --- a/fs/f2fs/inode.c
 +++ b/fs/f2fs/inode.c
-@@ -610,14 +610,6 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
+@@ -613,14 +613,6 @@ make_now:
        }
        f2fs_set_inode_flags(inode);
  
@@ -151,6 +145,3 @@ index 005dde72aff3d..791c06e159fd2 100644
        unlock_new_inode(inode);
        trace_f2fs_iget(inode);
        return inode;
--- 
-2.43.0
-