The patch titled
relay file read: start-pos fix
has been removed from the -mm tree. Its filename was
relay-file-read-start-pos-fixpatch.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: relay file read: start-pos fix
From: David Wilder <dwilder@xxxxxxxxxx>
Fix a bug in the relay read interface causing the number of consumed bytes
to be set incorrectly.
Signed-off-by: Tom Zanussi <zanussi@xxxxxxxxxx>
Signed-off-by: David Wilder <dwilder@xxxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/relay.c | 3 +++
1 files changed, 3 insertions(+)
diff -puN kernel/relay.c~relay-file-read-start-pos-fixpatch kernel/relay.c
--- a/kernel/relay.c~relay-file-read-start-pos-fixpatch
+++ a/kernel/relay.c
@@ -899,7 +899,10 @@ static size_t relay_file_read_start_pos(
size_t read_subbuf, padding, padding_start, padding_end;
size_t subbuf_size = buf->chan->subbuf_size;
size_t n_subbufs = buf->chan->n_subbufs;
+ size_t consumed = buf->subbufs_consumed % n_subbufs;
+ if (!read_pos)
+ read_pos = consumed * subbuf_size + buf->bytes_consumed;
read_subbuf = read_pos / subbuf_size;
padding = buf->padding[read_subbuf];
padding_start = (read_subbuf + 1) * subbuf_size - padding;
_
Patches currently in -mm which might be from dwilder@xxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
