Skip to content

Commit

Permalink
whitespace fixes: relayfs
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Walker <[email protected]>
Cc: Tom Zanussi <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Daniel Walker authored and Linus Torvalds committed Oct 18, 2007
1 parent dedf8b7 commit 1bfbc60
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/relay.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 1bfbc60

Please sign in to comment.