Commit b103a56f authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Greg Kroah-Hartman
Browse files

vmbus: drop no longer used kick_q argument 



The flag to cause notification of host is unused after
commit a01a291a282f7c2e ("Drivers: hv: vmbus: Base host signaling
strictly on the ring state"). Therefore remove it from the ring
buffer internal API.

Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c1bec61

drivers/hv/channel.c

+4 −9
Original line number Diff line number Diff line
@@ -670,9 +670,7 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer, 
	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);



	return hv_ringbuffer_write(channel, bufferlist, num_vecs,

				   lock, kick_q);



	return hv_ringbuffer_write(channel, bufferlist, num_vecs, lock);

}

EXPORT_SYMBOL(vmbus_sendpacket_ctl);
@@ -757,8 +755,7 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel, 
	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);



	return hv_ringbuffer_write(channel, bufferlist, 3,

				   lock, kick_q);

	return hv_ringbuffer_write(channel, bufferlist, 3, lock);

}

EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer_ctl);
@@ -813,8 +810,7 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, 
	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);



	return hv_ringbuffer_write(channel, bufferlist, 3,

				   lock, true);

	return hv_ringbuffer_write(channel, bufferlist, 3, lock);

}

EXPORT_SYMBOL_GPL(vmbus_sendpacket_mpb_desc);
@@ -871,8 +867,7 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel, 
	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);



	return hv_ringbuffer_write(channel, bufferlist, 3,

				   lock, true);

	return hv_ringbuffer_write(channel, bufferlist, 3, lock);

}

EXPORT_SYMBOL_GPL(vmbus_sendpacket_multipagebuffer);

drivers/hv/hyperv_vmbus.h

+2 −3
Original line number Diff line number Diff line
@@ -276,8 +276,7 @@ void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info); 


int hv_ringbuffer_write(struct vmbus_channel *channel,

			struct kvec *kv_list,

		    u32 kv_count, bool lock,

		    bool kick_q);

			u32 kv_count, bool lock);



int hv_ringbuffer_read(struct vmbus_channel *channel,

		       void *buffer, u32 buflen, u32 *buffer_actual_len,

drivers/hv/ring_buffer.c

+3 −5
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ u32 hv_end_read(struct hv_ring_buffer_info *rbi) 
 * host logic is fixed.

 */



static void hv_signal_on_write(u32 old_write, struct vmbus_channel *channel,

			       bool kick_q)

static void hv_signal_on_write(u32 old_write, struct vmbus_channel *channel)

{

	struct hv_ring_buffer_info *rbi = &channel->outbound;
@@ -285,8 +284,7 @@ void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info) 


/* Write to the ring buffer. */

int hv_ringbuffer_write(struct vmbus_channel *channel,

		    struct kvec *kv_list, u32 kv_count, bool lock,

		    bool kick_q)

			struct kvec *kv_list, u32 kv_count, bool lock)

{

	int i = 0;

	u32 bytes_avail_towrite;
@@ -352,7 +350,7 @@ int hv_ringbuffer_write(struct vmbus_channel *channel, 
	if (lock)

		spin_unlock_irqrestore(&outring_info->ring_lock, flags);



	hv_signal_on_write(old_write, channel, kick_q);

	hv_signal_on_write(old_write, channel);



	if (channel->rescind)

		return -ENODEV;