Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248927
b: refs/heads/master
c: 852c16d
h: refs/heads/master
i:
  248925: cc40b2d
  248923: dd234ec
  248919: e1ab967
  248911: e779f96
  248895: a92d837
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent 6fe6bfe commit c84c48c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 834702f82ab8fe1ea5de5e464764d5ca2d326dbd
refs/heads/master: 852c16dbdcf84d43803a4ccfa647cf2f2952afc9
14 changes: 0 additions & 14 deletions trunk/drivers/staging/hv/storvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,6 @@ static inline void free_stor_device(struct storvsc_device *device)
kfree(device);
}

/* Get the stordevice object iff exists and its refcount > 1 */
static inline struct storvsc_device *get_stor_device(struct hv_device *device)
{
struct storvsc_device *stor_device;

stor_device = (struct storvsc_device *)device->ext;
if (stor_device && atomic_read(&stor_device->ref_count) > 1)
atomic_inc(&stor_device->ref_count);
else
stor_device = NULL;

return stor_device;
}

/* Get the stordevice object iff exists and its refcount > 0 */
static inline struct storvsc_device *must_get_stor_device(
struct hv_device *device)
Expand Down
15 changes: 15 additions & 0 deletions trunk/drivers/staging/hv/storvsc_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,21 @@ struct storvsc_device {
struct storvsc_request_extension reset_request;
};


/* Get the stordevice object iff exists and its refcount > 1 */
static inline struct storvsc_device *get_stor_device(struct hv_device *device)
{
struct storvsc_device *stor_device;

stor_device = (struct storvsc_device *)device->ext;
if (stor_device && atomic_read(&stor_device->ref_count) > 1)
atomic_inc(&stor_device->ref_count);
else
stor_device = NULL;

return stor_device;
}

/* Interface */
int stor_vsc_on_host_reset(struct hv_device *device);

Expand Down

0 comments on commit c84c48c

Please sign in to comment.