diff options
author | Daniel Walker <dwalker@mvista.com> | 2007-10-18 06:06:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:24 -0400 |
commit | 1bfbc608ba05951678eedc246c9baf62367764a0 (patch) | |
tree | 1ef89e483cf643987f0294b6bc800c4f5560e2c2 /kernel/relay.c | |
parent | dedf8b79ec06e91fa87f6cba99e6e61b4140ceca (diff) |
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) | |||
370 | if (!chan) | 370 | if (!chan) |
371 | return; | 371 | return; |
372 | 372 | ||
373 | if (chan->is_global && chan->buf[0]) { | 373 | if (chan->is_global && chan->buf[0]) { |
374 | __relay_reset(chan->buf[0], 0); | 374 | __relay_reset(chan->buf[0], 0); |
375 | return; | 375 | return; |
376 | } | 376 | } |
@@ -850,13 +850,13 @@ static int relay_file_read_avail(struct rchan_buf *buf, size_t read_pos) | |||
850 | buf->subbufs_consumed = consumed; | 850 | buf->subbufs_consumed = consumed; |
851 | buf->bytes_consumed = 0; | 851 | buf->bytes_consumed = 0; |
852 | } | 852 | } |
853 | 853 | ||
854 | produced = (produced % n_subbufs) * subbuf_size + buf->offset; | 854 | produced = (produced % n_subbufs) * subbuf_size + buf->offset; |
855 | consumed = (consumed % n_subbufs) * subbuf_size + buf->bytes_consumed; | 855 | consumed = (consumed % n_subbufs) * subbuf_size + buf->bytes_consumed; |
856 | 856 | ||
857 | if (consumed > produced) | 857 | if (consumed > produced) |
858 | produced += n_subbufs * subbuf_size; | 858 | produced += n_subbufs * subbuf_size; |
859 | 859 | ||
860 | if (consumed == produced) | 860 | if (consumed == produced) |
861 | return 0; | 861 | return 0; |
862 | 862 | ||