Index: fs/relayfs/relay.c =================================================================== RCS file: /export/cvsroot/SuSE-Kernel-2.4.21/fs/relayfs/Attic/relay.c,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 relay.c --- fs/relayfs/relay.c 18 Feb 2005 00:00:51 -0000 1.1.2.1 +++ fs/relayfs/relay.c 23 Mar 2005 09:00:42 -0000 @@ -1445,26 +1445,22 @@ avail_offset = cur_idx = relay_get_offset(rchan, &max_offset); + last_buf_byte_offset = (read_bufno + 1) * buf_size - 1; if (cur_idx == read_offset) { if (atomic_read(&rchan->suspended) == 1) { - read_offset += 1; + read_offset = last_buf_byte_offset + 1; if (read_offset >= max_offset) read_offset = 0; *actual_read_offset = read_offset; } else { - *new_offset = read_offset; + *new_offset = read_offset; return 0; } - } else { - last_buf_byte_offset = (read_bufno + 1) * buf_size - 1; - if (read_offset == last_buf_byte_offset) { - if (unused_bytes != 1) { - read_offset += 1; - if (read_offset >= max_offset) - read_offset = 0; - *actual_read_offset = read_offset; - } - } + } else if ((read_offset + unused_bytes) > last_buf_byte_offset) { + read_offset = last_buf_byte_offset + 1; + if (read_offset >= max_offset) + read_offset = 0; + *actual_read_offset = read_offset; } read_bufno = read_offset / buf_size;