The patch titled
relayfs: fix infinite loop with splice()
has been removed from the -mm tree. Its filename was
relayfs-fix-infinite-loop-with-splice.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: relayfs: fix infinite loop with splice()
From: Tom Zanussi <zanussi@xxxxxxxxxxx>
Running kmemtraced, which uses splice() on relayfs, causes a hard lock on
x86-64 SMP. As described by Tom Zanussi:
It looks like you hit the same problem as described here:
commit 8191ecd1d14c6914c660dfa007154860a7908857
splice: fix infinite loop in generic_file_splice_read()
relay uses the same loop but it never got noticed or fixed.
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Tested-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Signed-off-by: Tom Zanussi <tzanussi@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/relay.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff -puN kernel/relay.c~relayfs-fix-infinite-loop-with-splice kernel/relay.c
--- a/kernel/relay.c~relayfs-fix-infinite-loop-with-splice
+++ a/kernel/relay.c
@@ -1317,12 +1317,9 @@ static ssize_t relay_file_splice_read(st
if (ret < 0)
break;
else if (!ret) {
- if (spliced)
- break;
- if (flags & SPLICE_F_NONBLOCK) {
+ if (flags & SPLICE_F_NONBLOCK)
ret = -EAGAIN;
- break;
- }
+ break;
}
*ppos += ret;
_
Patches currently in -mm which might be from zanussi@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
