Skip to content

Commit

Permalink
Staging: hv: storvsc: Rename get_stor_device()
Browse files Browse the repository at this point in the history
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: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 29, 2011
1 parent bf49e80 commit 1eaaddf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion drivers/staging/hv/hyperv_storage.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/hv/storvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
{
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/storvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 1eaaddf

Please sign in to comment.