sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux 6.1.y: Update bcachefs patch for 6.1.4

Browse Source
This commit is contained in:
Tk-Glitch
2023-01-11 18:11:04 +01:00
parent 3d2b09d984
commit c146fa94b6
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
linux-tkg-patches/6.1/0008-6.1-bcachefs.patch
View File

@@ -90612,16 +90612,28 @@ index 5cfc95a52bc3..be075882450a 100644
} }
static DEFINE_STATIC_KEY_FALSE(trace_no_verify); 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); trace_access_lock(iter->cpu_file);
while (trace_find_next_entry_inc(iter) != NULL) { while (trace_find_next_entry_inc(iter) != NULL) {
enum print_line_t ret; enum print_line_t ret;
- int save_len = iter->seq.seq.len; - int save_len = iter->seq.seq.len;
+ int save_pos = iter->seq.seq.pos; + int save_pos = iter->seq.seq.pos;
ret = print_trace_line(iter); ret = print_trace_line(iter);
if (ret == TRACE_TYPE_PARTIAL_LINE) { 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.len = save_len;
+ iter->seq.seq.pos = save_pos; + iter->seq.seq.pos = save_pos;
break; break;