From c146fa94b6e84b9cb661278cb695f3e116e3413d Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Wed, 11 Jan 2023 18:11:04 +0100 Subject: [PATCH] linux 6.1.y: Update bcachefs patch for 6.1.4 --- linux-tkg-patches/6.1/0008-6.1-bcachefs.patch | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/linux-tkg-patches/6.1/0008-6.1-bcachefs.patch b/linux-tkg-patches/6.1/0008-6.1-bcachefs.patch index daeeb07..be41274 100644 --- a/linux-tkg-patches/6.1/0008-6.1-bcachefs.patch +++ b/linux-tkg-patches/6.1/0008-6.1-bcachefs.patch @@ -90612,16 +90612,28 @@ index 5cfc95a52bc3..be075882450a 100644 } static DEFINE_STATIC_KEY_FALSE(trace_no_verify); -@@ -6792,12 +6788,12 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, +@@ -6793,7 +6789,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, trace_access_lock(iter->cpu_file); while (trace_find_next_entry_inc(iter) != NULL) { enum print_line_t ret; - int save_len = iter->seq.seq.len; + int save_pos = iter->seq.seq.pos; - + ret = print_trace_line(iter); if (ret == TRACE_TYPE_PARTIAL_LINE) { - /* don't print partial lines */ +@@ -6803,7 +6799,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, + * In this case, we need to consume it, otherwise, loop will peek + * this event next time, resulting in an infinite loop. + */ +- if (save_len == 0) { ++ if (save_pos == 0) { + iter->seq.full = 0; + trace_seq_puts(&iter->seq, "[LINE TOO BIG]\n"); + trace_consume(iter); +@@ -6811,7 +6807,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, + } + + /* In other cases, don't print partial lines */ - iter->seq.seq.len = save_len; + iter->seq.seq.pos = save_pos; break;