Commit a89186c2 authored May 10, 2011 by K. Y. Srinivasan Committed by Greg Kroah-Hartman May 11, 2011

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>

parent 633c4dce

drivers/staging/hv/channel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

drivers/staging/hv/ring_buffer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

drivers/staging/hv/ring_buffer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,