diff options
| -rw-r--r-- | include/linux/cgroup.h | 2 | ||||
| -rw-r--r-- | include/linux/percpu-refcount.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index c2515851c1aa..549aed8de32b 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
| @@ -101,7 +101,7 @@ static inline bool css_tryget(struct cgroup_subsys_state *css) | |||
| 101 | { | 101 | { |
| 102 | if (css->flags & CSS_ROOT) | 102 | if (css->flags & CSS_ROOT) |
| 103 | return true; | 103 | return true; |
| 104 | return percpu_ref_tryget(&css->refcnt); | 104 | return percpu_ref_tryget_live(&css->refcnt); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | /** | 107 | /** |
diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h index 95961f0bf62d..e22d15597cc3 100644 --- a/include/linux/percpu-refcount.h +++ b/include/linux/percpu-refcount.h | |||
| @@ -118,7 +118,7 @@ static inline void percpu_ref_get(struct percpu_ref *ref) | |||
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | /** | 120 | /** |
| 121 | * percpu_ref_tryget - try to increment a percpu refcount | 121 | * percpu_ref_tryget_live - try to increment a live percpu refcount |
| 122 | * @ref: percpu_ref to try-get | 122 | * @ref: percpu_ref to try-get |
| 123 | * | 123 | * |
| 124 | * Increment a percpu refcount unless it has already been killed. Returns | 124 | * Increment a percpu refcount unless it has already been killed. Returns |
| @@ -129,7 +129,7 @@ static inline void percpu_ref_get(struct percpu_ref *ref) | |||
| 129 | * used. After the confirm_kill callback is invoked, it's guaranteed that | 129 | * used. After the confirm_kill callback is invoked, it's guaranteed that |
| 130 | * no new reference will be given out by percpu_ref_tryget(). | 130 | * no new reference will be given out by percpu_ref_tryget(). |
| 131 | */ | 131 | */ |
| 132 | static inline bool percpu_ref_tryget(struct percpu_ref *ref) | 132 | static inline bool percpu_ref_tryget_live(struct percpu_ref *ref) |
| 133 | { | 133 | { |
| 134 | unsigned __percpu *pcpu_count; | 134 | unsigned __percpu *pcpu_count; |
| 135 | int ret = false; | 135 | int ret = false; |
