Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1eaaddf9 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: storvsc: Rename get_stor_device() 



In preparation for cleaning up how we manage reference counts on the stor
device, clearly distinguish why we are attempting to acquire a reference.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bf49e809

drivers/staging/hv/hyperv_storage.h

+2 −1
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ struct storvsc_device { 




/* Get the stordevice object iff exists and its refcount > 1 */

static inline struct storvsc_device *get_stor_device(struct hv_device *device)

static inline struct storvsc_device *get_out_stor_device(

					struct hv_device *device)

{

	struct storvsc_device *stor_device;

drivers/staging/hv/storvsc.c

+4 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static inline struct storvsc_device *alloc_stor_device(struct hv_device *device) 
		return NULL;



	/* Set to 2 to allow both inbound and outbound traffics */

	/* (ie get_stor_device() and get_in_stor_device()) to proceed. */

	/* (ie get_out_stor_device() and get_in_stor_device()) to proceed. */

	atomic_cmpxchg(&stor_device->ref_count, 0, 2);



	init_waitqueue_head(&stor_device->waiting_to_drain);
@@ -67,7 +67,7 @@ static inline struct storvsc_device *get_in_stor_device( 
	return stor_device;

}



/* Drop ref count to 1 to effectively disable get_stor_device() */

/* Drop ref count to 1 to effectively disable get_out_stor_device() */

static inline struct storvsc_device *release_stor_device(

					struct hv_device *device)

{
@@ -105,7 +105,7 @@ static int storvsc_channel_init(struct hv_device *device) 
	struct vstor_packet *vstor_packet;

	int ret, t;



	stor_device = get_stor_device(device);

	stor_device = get_out_stor_device(device);

	if (!stor_device)

		return -ENODEV;
@@ -427,7 +427,7 @@ int storvsc_do_io(struct hv_device *device, 
	int ret = 0;



	vstor_packet = &request->vstor_packet;

	stor_device = get_stor_device(device);

	stor_device = get_out_stor_device(device);



	if (!stor_device)

		return -ENODEV;

drivers/staging/hv/storvsc_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int storvsc_host_reset(struct hv_device *device) 
	int ret, t;





	stor_device = get_stor_device(device);

	stor_device = get_out_stor_device(device);

	if (!stor_device)

		return -ENODEV;