* [PATCH] Fix kfifo_alloc() to return a signed int value
@ 2010-10-20 20:12 stefani
2010-10-20 20:12 ` stefani
2010-10-20 21:16 ` Andrew Morton
0 siblings, 2 replies; 4+ messages in thread
From: stefani @ 2010-10-20 20:12 UTC (permalink / raw)
To: linux-kernel, akpm, randy.dunlap, alan; +Cc: stefani
From: Stefani Seibold <stefani@seibold.net>
This patch adds a new __kfifo_int_must_check_helper() helper function,
which is needed for kfifo_alloc() to return the right signed integer
value.
The origin __kfifo_must_check_helper() helper was renamed into
__kfifo_uint_must_check_helper() to show the sign which is expected and
returned.
Signed-off-by: Stefani Seibold <stefani@seibold.net>
---
include/linux/kfifo.h | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h
index 62dbee5..10308c6 100644
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@ -172,7 +172,13 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void);
static inline unsigned int __must_check
-__kfifo_must_check_helper(unsigned int val)
+__kfifo_uint_must_check_helper(unsigned int val)
+{
+ return val;
+}
+
+static inline int __must_check
+__kfifo_int_must_check_helper(int val)
{
return val;
}
@@ -267,7 +273,7 @@ __kfifo_must_check_helper(unsigned int val)
* @fifo: address of the fifo to be used
*/
#define kfifo_avail(fifo) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmpq = (fifo); \
const size_t __recsize = sizeof(*__tmpq->rectype); \
@@ -300,7 +306,7 @@ __kfifo_must_check_helper( \
* This function returns the size of the next fifo record in number of bytes.
*/
#define kfifo_peek_len(fifo) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
const size_t __recsize = sizeof(*__tmp->rectype); \
@@ -323,7 +329,7 @@ __kfifo_must_check_helper( \
* Return 0 if no error, otherwise an error code.
*/
#define kfifo_alloc(fifo, size, gfp_mask) \
-__kfifo_must_check_helper( \
+__kfifo_int_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
struct __kfifo *__kfifo = &__tmp->kfifo; \
@@ -419,7 +425,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_get(fifo, val) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
typeof((val) + 1) __val = (val); \
@@ -460,7 +466,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_peek(fifo, val) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
typeof((val) + 1) __val = (val); \
@@ -552,7 +558,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_out(fifo, buf, n) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
typeof((buf) + 1) __buf = (buf); \
@@ -580,7 +586,7 @@ __kfifo_must_check_helper( \
* copied.
*/
#define kfifo_out_spinlocked(fifo, buf, n, lock) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
unsigned long __flags; \
unsigned int __ret; \
@@ -609,7 +615,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_from_user(fifo, from, len, copied) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
const void __user *__from = (from); \
@@ -637,7 +643,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_to_user(fifo, to, len, copied) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
void __user *__to = (to); \
@@ -764,7 +770,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_out_peek(fifo, buf, n) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
typeof((buf) + 1) __buf = (buf); \
--
1.7.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] Fix kfifo_alloc() to return a signed int value
2010-10-20 20:12 [PATCH] Fix kfifo_alloc() to return a signed int value stefani
@ 2010-10-20 20:12 ` stefani
2010-10-20 20:26 ` Randy Dunlap
2010-10-20 21:16 ` Andrew Morton
1 sibling, 1 reply; 4+ messages in thread
From: stefani @ 2010-10-20 20:12 UTC (permalink / raw)
To: linux-kernel, akpm, randy.dunlap, alan; +Cc: stefani
From: Stefani Seibold <stefani@seibold.net>
This patch adds a new __kfifo_int_must_check_helper() helper function,
which is needed for kfifo_alloc() to return the right signed integer
value.
The origin __kfifo_must_check_helper() helper was renamed into
__kfifo_uint_must_check_helper() to show the sign which is expected and
returned.
Signed-off-by: Stefani Seibold <stefani@seibold.net>
---
include/linux/kfifo.h | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h
index 62dbee5..10308c6 100644
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@ -172,7 +172,13 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void);
static inline unsigned int __must_check
-__kfifo_must_check_helper(unsigned int val)
+__kfifo_uint_must_check_helper(unsigned int val)
+{
+ return val;
+}
+
+static inline int __must_check
+__kfifo_int_must_check_helper(int val)
{
return val;
}
@@ -267,7 +273,7 @@ __kfifo_must_check_helper(unsigned int val)
* @fifo: address of the fifo to be used
*/
#define kfifo_avail(fifo) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmpq = (fifo); \
const size_t __recsize = sizeof(*__tmpq->rectype); \
@@ -300,7 +306,7 @@ __kfifo_must_check_helper( \
* This function returns the size of the next fifo record in number of bytes.
*/
#define kfifo_peek_len(fifo) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
const size_t __recsize = sizeof(*__tmp->rectype); \
@@ -323,7 +329,7 @@ __kfifo_must_check_helper( \
* Return 0 if no error, otherwise an error code.
*/
#define kfifo_alloc(fifo, size, gfp_mask) \
-__kfifo_must_check_helper( \
+__kfifo_int_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
struct __kfifo *__kfifo = &__tmp->kfifo; \
@@ -419,7 +425,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_get(fifo, val) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
typeof((val) + 1) __val = (val); \
@@ -460,7 +466,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_peek(fifo, val) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
typeof((val) + 1) __val = (val); \
@@ -552,7 +558,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_out(fifo, buf, n) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
typeof((buf) + 1) __buf = (buf); \
@@ -580,7 +586,7 @@ __kfifo_must_check_helper( \
* copied.
*/
#define kfifo_out_spinlocked(fifo, buf, n, lock) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
unsigned long __flags; \
unsigned int __ret; \
@@ -609,7 +615,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_from_user(fifo, from, len, copied) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
const void __user *__from = (from); \
@@ -637,7 +643,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_to_user(fifo, to, len, copied) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
void __user *__to = (to); \
@@ -764,7 +770,7 @@ __kfifo_must_check_helper( \
* writer, you don't need extra locking to use these macro.
*/
#define kfifo_out_peek(fifo, buf, n) \
-__kfifo_must_check_helper( \
+__kfifo_uint_must_check_helper( \
({ \
typeof((fifo) + 1) __tmp = (fifo); \
typeof((buf) + 1) __buf = (buf); \
--
1.7.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Fix kfifo_alloc() to return a signed int value
2010-10-20 20:12 ` stefani
@ 2010-10-20 20:26 ` Randy Dunlap
0 siblings, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2010-10-20 20:26 UTC (permalink / raw)
To: stefani; +Cc: linux-kernel, akpm, alan
On 10/20/10 13:12, stefani@seibold.net wrote:
> From: Stefani Seibold <stefani@seibold.net>
>
> This patch adds a new __kfifo_int_must_check_helper() helper function,
> which is needed for kfifo_alloc() to return the right signed integer
> value.
>
> The origin __kfifo_must_check_helper() helper was renamed into
> __kfifo_uint_must_check_helper() to show the sign which is expected and
> returned.
>
> Signed-off-by: Stefani Seibold <stefani@seibold.net>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Thanks.
> ---
> include/linux/kfifo.h | 28 +++++++++++++++++-----------
> 1 files changed, 17 insertions(+), 11 deletions(-)
>
> diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h
> index 62dbee5..10308c6 100644
> --- a/include/linux/kfifo.h
> +++ b/include/linux/kfifo.h
> @@ -172,7 +172,13 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void);
>
>
> static inline unsigned int __must_check
> -__kfifo_must_check_helper(unsigned int val)
> +__kfifo_uint_must_check_helper(unsigned int val)
> +{
> + return val;
> +}
> +
> +static inline int __must_check
> +__kfifo_int_must_check_helper(int val)
> {
> return val;
> }
> @@ -267,7 +273,7 @@ __kfifo_must_check_helper(unsigned int val)
> * @fifo: address of the fifo to be used
> */
> #define kfifo_avail(fifo) \
> -__kfifo_must_check_helper( \
> +__kfifo_uint_must_check_helper( \
> ({ \
> typeof((fifo) + 1) __tmpq = (fifo); \
> const size_t __recsize = sizeof(*__tmpq->rectype); \
> @@ -300,7 +306,7 @@ __kfifo_must_check_helper( \
> * This function returns the size of the next fifo record in number of bytes.
> */
> #define kfifo_peek_len(fifo) \
> -__kfifo_must_check_helper( \
> +__kfifo_uint_must_check_helper( \
> ({ \
> typeof((fifo) + 1) __tmp = (fifo); \
> const size_t __recsize = sizeof(*__tmp->rectype); \
> @@ -323,7 +329,7 @@ __kfifo_must_check_helper( \
> * Return 0 if no error, otherwise an error code.
> */
> #define kfifo_alloc(fifo, size, gfp_mask) \
> -__kfifo_must_check_helper( \
> +__kfifo_int_must_check_helper( \
> ({ \
> typeof((fifo) + 1) __tmp = (fifo); \
> struct __kfifo *__kfifo = &__tmp->kfifo; \
> @@ -419,7 +425,7 @@ __kfifo_must_check_helper( \
> * writer, you don't need extra locking to use these macro.
> */
> #define kfifo_get(fifo, val) \
> -__kfifo_must_check_helper( \
> +__kfifo_uint_must_check_helper( \
> ({ \
> typeof((fifo) + 1) __tmp = (fifo); \
> typeof((val) + 1) __val = (val); \
> @@ -460,7 +466,7 @@ __kfifo_must_check_helper( \
> * writer, you don't need extra locking to use these macro.
> */
> #define kfifo_peek(fifo, val) \
> -__kfifo_must_check_helper( \
> +__kfifo_uint_must_check_helper( \
> ({ \
> typeof((fifo) + 1) __tmp = (fifo); \
> typeof((val) + 1) __val = (val); \
> @@ -552,7 +558,7 @@ __kfifo_must_check_helper( \
> * writer, you don't need extra locking to use these macro.
> */
> #define kfifo_out(fifo, buf, n) \
> -__kfifo_must_check_helper( \
> +__kfifo_uint_must_check_helper( \
> ({ \
> typeof((fifo) + 1) __tmp = (fifo); \
> typeof((buf) + 1) __buf = (buf); \
> @@ -580,7 +586,7 @@ __kfifo_must_check_helper( \
> * copied.
> */
> #define kfifo_out_spinlocked(fifo, buf, n, lock) \
> -__kfifo_must_check_helper( \
> +__kfifo_uint_must_check_helper( \
> ({ \
> unsigned long __flags; \
> unsigned int __ret; \
> @@ -609,7 +615,7 @@ __kfifo_must_check_helper( \
> * writer, you don't need extra locking to use these macro.
> */
> #define kfifo_from_user(fifo, from, len, copied) \
> -__kfifo_must_check_helper( \
> +__kfifo_uint_must_check_helper( \
> ({ \
> typeof((fifo) + 1) __tmp = (fifo); \
> const void __user *__from = (from); \
> @@ -637,7 +643,7 @@ __kfifo_must_check_helper( \
> * writer, you don't need extra locking to use these macro.
> */
> #define kfifo_to_user(fifo, to, len, copied) \
> -__kfifo_must_check_helper( \
> +__kfifo_uint_must_check_helper( \
> ({ \
> typeof((fifo) + 1) __tmp = (fifo); \
> void __user *__to = (to); \
> @@ -764,7 +770,7 @@ __kfifo_must_check_helper( \
> * writer, you don't need extra locking to use these macro.
> */
> #define kfifo_out_peek(fifo, buf, n) \
> -__kfifo_must_check_helper( \
> +__kfifo_uint_must_check_helper( \
> ({ \
> typeof((fifo) + 1) __tmp = (fifo); \
> typeof((buf) + 1) __buf = (buf); \
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix kfifo_alloc() to return a signed int value
2010-10-20 20:12 [PATCH] Fix kfifo_alloc() to return a signed int value stefani
2010-10-20 20:12 ` stefani
@ 2010-10-20 21:16 ` Andrew Morton
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Morton @ 2010-10-20 21:16 UTC (permalink / raw)
To: stefani; +Cc: linux-kernel, randy.dunlap, alan
On Wed, 20 Oct 2010 22:12:23 +0200
stefani@seibold.net wrote:
> This patch adds a new __kfifo_int_must_check_helper() helper function,
> which is needed for kfifo_alloc() to return the right signed integer
> value.
>
> The origin __kfifo_must_check_helper() helper was renamed into
> __kfifo_uint_must_check_helper() to show the sign which is expected and
> returned.
>
> Signed-off-by: Stefani Seibold <stefani@seibold.net>
> ---
> include/linux/kfifo.h | 28 +++++++++++++++++-----------
We're probably just days away from 2.6.36. I went with the
safe-and-stupid fix. I'll queue this patch for 2.6.37-rc1.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-20 21:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-20 20:12 [PATCH] Fix kfifo_alloc() to return a signed int value stefani
2010-10-20 20:12 ` stefani
2010-10-20 20:26 ` Randy Dunlap
2010-10-20 21:16 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox