diff options
| author | K. Y. Srinivasan | 2011-05-10 16:55:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-05-11 22:49:02 +0200 |
| commit | a89186c21ccea2f06014b26463a39a1eea1efdf7 (patch) | |
| tree | 2e03daf5508d075020260b53d64e8b0cdbb73afd /drivers | |
| parent | Staging: hv: Rename ringbuffer_write (diff) | |
| download | kernel-qcow2-linux-a89186c21ccea2f06014b26463a39a1eea1efdf7.tar.gz kernel-qcow2-linux-a89186c21ccea2f06014b26463a39a1eea1efdf7.tar.xz kernel-qcow2-linux-a89186c21ccea2f06014b26463a39a1eea1efdf7.zip | |
Staging: hv: Rename ringbuffer_peek
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/hv/channel.c | 4 | ||||
| -rw-r--r-- | drivers/staging/hv/ring_buffer.c | 4 | ||||
| -rw-r--r-- | drivers/staging/hv/ring_buffer.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c index 859771c01611..d6255178fed0 100644 --- a/drivers/staging/hv/channel.c +++ b/drivers/staging/hv/channel.c @@ -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); @@ -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); diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c index 483678c83eba..bf04397c299c 100644 --- a/drivers/staging/hv/ring_buffer.c +++ b/drivers/staging/hv/ring_buffer.c @@ -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; diff --git a/drivers/staging/hv/ring_buffer.h b/drivers/staging/hv/ring_buffer.h index 5c172889d116..c684d9718c64 100644 --- a/drivers/staging/hv/ring_buffer.h +++ b/drivers/staging/hv/ring_buffer.h @@ -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, |