The patch titled
relayfs: fix overwrites
has been removed from the -mm tree. Its filename was
relayfs-fix-overwrites.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: relayfs: fix overwrites
From: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
When I use relayfs with "overwrite" mode, read() still sets incorrect
number of consumed bytes.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Acked-by: Tom Zanussi <zanussi@xxxxxxxxxx>
Acked-by: David Wilder <dwilder@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/relay.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff -puN kernel/relay.c~relayfs-fix-overwrites kernel/relay.c
--- a/kernel/relay.c~relayfs-fix-overwrites
+++ a/kernel/relay.c
@@ -812,7 +812,10 @@ static void relay_file_read_consume(stru
}
buf->bytes_consumed += bytes_consumed;
- read_subbuf = read_pos / buf->chan->subbuf_size;
+ if (!read_pos)
+ read_subbuf = buf->subbufs_consumed;
+ else
+ read_subbuf = read_pos / buf->chan->subbuf_size;
if (buf->bytes_consumed + buf->padding[read_subbuf] == subbuf_size) {
if ((read_subbuf == buf->subbufs_produced % n_subbufs) &&
(buf->offset == subbuf_size))
@@ -841,8 +844,9 @@ static int relay_file_read_avail(struct
}
if (unlikely(produced - consumed >= n_subbufs)) {
- consumed = (produced / n_subbufs) * n_subbufs;
+ consumed = produced - n_subbufs + 1;
buf->subbufs_consumed = consumed;
+ buf->bytes_consumed = 0;
}
produced = (produced % n_subbufs) * subbuf_size + buf->offset;
_
Patches currently in -mm which might be from masami.hiramatsu.pt@xxxxxxxxxxx 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
