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

Staging: hv: Rename ringbuffer_read



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 a89186c2

drivers/staging/hv/channel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -911,7 +911,7 @@ int vmbus_recvpacket(struct vmbus_channel channel, void buffer,
		*requestid = desc.trans_id;

		/* Copy over the packet to the user buffer */
		ret = ringbuffer_read(&channel->inbound, buffer, userlen,
		ret = hv_ringbuffer_read(&channel->inbound, buffer, userlen,
		(desc.offset8 << 3));

		spin_unlock_irqrestore(&channel->inbound_lock, flags);
		@@ -964,7 +964,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel channel, void buffer,
		*requestid = desc.trans_id;

		/* Copy over the entire packet to the user buffer */
		ret = ringbuffer_read(&channel->inbound, buffer, packetlen, 0);
		ret = hv_ringbuffer_read(&channel->inbound, buffer, packetlen, 0);

		spin_unlock_irqrestore(&channel->inbound_lock, flags);
		return 0;

drivers/staging/hv/ring_buffer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -468,13 +468,13 @@ int hv_ringbuffer_peek(struct hv_ring_buffer_info *Inring_info,
		/*++

		Name:
		ringbuffer_read()
		hv_ringbuffer_read()

		Description:
		Read and advance the read index

		--*/
		int ringbuffer_read(struct hv_ring_buffer_info inring_info, void buffer,
		int hv_ringbuffer_read(struct hv_ring_buffer_info inring_info, void buffer,
		u32 buflen, u32 offset)
		{
		u32 bytes_avail_towrite;

drivers/staging/hv/ring_buffer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ int hv_ringbuffer_write(struct hv_ring_buffer_info *ring_info,
		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,
		int hv_ringbuffer_read(struct hv_ring_buffer_info *ring_info,
		void *buffer,
		u32 buflen,
		u32 offset);