Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

relay file read: start-pos fix

Fix a bug in the relay read interface causing the number of consumed bytes
to be set incorrectly.

Signed-off-by: Tom Zanussi <zanussi@us.ibm.com>
Signed-off-by: David Wilder <dwilder@us.ibm.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
David Wilder 18 years ago
parent
ea7fc3336b
commit
8d62fdebda
1 changed files with 3 additions and 0 deletions
Unified View Show Diff Stats
  1. 3 0
      kernel/relay.c

+ 3 - 0
kernel/relay.c
View File 

@@ -899,7 +899,10 @@ static size_t relay_file_read_start_pos(size_t read_pos,
 
 	size_t read_subbuf, padding, padding_start, padding_end;
 
 	size_t read_subbuf, padding, padding_start, padding_end;
 
 	size_t subbuf_size = buf->chan->subbuf_size;
 
 	size_t subbuf_size = buf->chan->subbuf_size;
 
 	size_t n_subbufs = buf->chan->n_subbufs;
 
 	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;
 
 	read_subbuf = read_pos / subbuf_size;
 
 	padding = buf->padding[read_subbuf];
 
 	padding = buf->padding[read_subbuf];
 
 	padding_start = (read_subbuf + 1) * subbuf_size - padding;
 
 	padding_start = (read_subbuf + 1) * subbuf_size - padding;