projects/linux·commit 5d6dec6f

locking/refcount: Remove the half-implemented refcount_sub() API

5d6dec6f · Kees Cook <[email protected]> · 2017-07-01 11:01:29 -07:00

CONFIG_REFCOUNT_FULL=y (correctly) does not provide a refcount_sub(),
which should not be part of proper refcount design patterns.

Remove the erroneous extern and the later !CONFIG_REFCOUNT_FULL
accidental implementation.

Signed-off-by: Kees Cook <[email protected]>
Cc: Elena Reshetova <[email protected]>
Cc: Josh Poimboeuf <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Fixes: 29dee3c03abc ("locking/refcounts: Out-of-line everything")
Link: http://lkml.kernel.org/r/20170701180129.GA17405@beast
Signed-off-by: Ingo Molnar <[email protected]>
Commit
5d6dec6fba38c3e2d408df108bb92ef4ac201f18
Parents
fd25d19f

Changes

1 files changed · +0 −6

FileStatusAddDelContent
include/linux/refcount.hmodified+0−6View file

include/linux/refcount.h

View file
diff --git a/include/linux/refcount.h b/include/linux/refcount.h
index bb71f28..591792c 100644
--- a/include/linux/refcount.h
+++ b/include/linux/refcount.h
@@ -49,7 +49,6 @@ extern __must_check bool refcount_inc_not_zero(refcount_t *r);
extern void refcount_inc(refcount_t *r);
extern __must_check bool refcount_sub_and_test(unsigned int i, refcount_t *r);
-extern void refcount_sub(unsigned int i, refcount_t *r);
extern __must_check bool refcount_dec_and_test(refcount_t *r);
extern void refcount_dec(refcount_t *r);
@@ -79,11 +78,6 @@ static inline __must_check bool refcount_sub_and_test(unsigned int i, refcount_t
return atomic_sub_and_test(i, &r->refs);
}
-static inline void refcount_sub(unsigned int i, refcount_t *r)
-{
- atomic_sub(i, &r->refs);
-}
-
static inline __must_check bool refcount_dec_and_test(refcount_t *r)
{
return atomic_dec_and_test(&r->refs);