Skip to content

Commit

Permalink
Staging: hv: Rename ringbuffer_peek
Browse files Browse the repository at this point in the history
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 11, 2011
1 parent 633c4dc commit a89186c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/hv/channel.c
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,

spin_lock_irqsave(&channel->inbound_lock, flags);

ret = ringbuffer_peek(&channel->inbound, &desc,
ret = hv_ringbuffer_peek(&channel->inbound, &desc,
sizeof(struct vmpacket_descriptor));
if (ret != 0) {
spin_unlock_irqrestore(&channel->inbound_lock, flags);
Expand Down Expand Up @@ -938,7 +938,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,

spin_lock_irqsave(&channel->inbound_lock, flags);

ret = ringbuffer_peek(&channel->inbound, &desc,
ret = hv_ringbuffer_peek(&channel->inbound, &desc,
sizeof(struct vmpacket_descriptor));
if (ret != 0) {
spin_unlock_irqrestore(&channel->inbound_lock, flags);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/hv/ring_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -418,13 +418,13 @@ int hv_ringbuffer_write(struct hv_ring_buffer_info *outring_info,
/*++
Name:
ringbuffer_peek()
hv_ringbuffer_peek()
Description:
Read without advancing the read index
--*/
int ringbuffer_peek(struct hv_ring_buffer_info *Inring_info,
int hv_ringbuffer_peek(struct hv_ring_buffer_info *Inring_info,
void *Buffer, u32 buflen)
{
u32 bytes_avail_towrite;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/ring_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ int hv_ringbuffer_write(struct hv_ring_buffer_info *ring_info,
struct scatterlist *sglist,
u32 sgcount);

int ringbuffer_peek(struct hv_ring_buffer_info *ring_info, void *buffer,
int hv_ringbuffer_peek(struct hv_ring_buffer_info *ring_info, void *buffer,
u32 buflen);

int ringbuffer_read(struct hv_ring_buffer_info *ring_info,
Expand Down

0 comments on commit a89186c

Please sign in to comment.