diff options
| author | Daniel Walker <dwalker@mvista.com> | 2007-10-18 12:06:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 23:37:24 +0200 |
| commit | 1bfbc608ba05951678eedc246c9baf62367764a0 (patch) | |
| tree | 1ef89e483cf643987f0294b6bc800c4f5560e2c2 /kernel/relay.c | |
| parent | whitespace fixes: cpuset (diff) | |
| download | linux-1bfbc608ba05951678eedc246c9baf62367764a0.tar.xz linux-1bfbc608ba05951678eedc246c9baf62367764a0.zip | |
whitespace fixes: relayfs
Signed-off-by: Daniel Walker <dwalker@mvista.com>
Cc: Tom Zanussi <zanussi@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/relay.c')
| -rw-r--r-- | kernel/relay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index ad855017bc59..61134eb7a0c8 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -370,7 +370,7 @@ void relay_reset(struct rchan *chan) if (!chan) return; - if (chan->is_global && chan->buf[0]) { + if (chan->is_global && chan->buf[0]) { __relay_reset(chan->buf[0], 0); return; } @@ -850,13 +850,13 @@ static int relay_file_read_avail(struct rchan_buf *buf, size_t read_pos) buf->subbufs_consumed = consumed; buf->bytes_consumed = 0; } - + produced = (produced % n_subbufs) * subbuf_size + buf->offset; consumed = (consumed % n_subbufs) * subbuf_size + buf->bytes_consumed; if (consumed > produced) produced += n_subbufs * subbuf_size; - + if (consumed == produced) return 0; |