Merge cf221a7880 ("ring-buffer: Update "shortest_full" in polling") into android11-5.4-lts

Steps on the way to 5.4.258

Change-Id: I023aadde4d7ab16ac9c5393996cc24ed20874e2d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-10-25 07:31:54 +00:00
commit 5ca567aeaa

View File

@ -741,6 +741,9 @@ __poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,
if (full) {
poll_wait(filp, &work->full_waiters, poll_table);
work->full_waiters_pending = true;
if (!cpu_buffer->shortest_full ||
cpu_buffer->shortest_full > full)
cpu_buffer->shortest_full = full;
} else {
poll_wait(filp, &work->waiters, poll_table);
work->waiters_pending = true;