From ccb68b7c19bf3ca9d64239b38ce5d998d9ee5cc3 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 22 Feb 2011 18:18:17 -0500 Subject: [PATCH] Linux: Reduce key_alloc flags confusion KEY_ALLOC_IN_QUOTA should be 0, not 1. Signed-off-by: Anders Kaseorg Reviewed-on: http://gerrit.openafs.org/4033 (cherry picked from commit dfcd3fcae5e2d2c22f9692c60f0b4e5858c25c9e) Change-Id: I910e87f147a5fc5022cacb8dee799503ebf5476b Signed-off-by: Anders Kaseorg (cherry picked from commit 4cf4381af5130f7c7845a6a24c55a3623383581a) --- src/afs/LINUX/osi_compat.h | 9 --------- src/afs/sysincludes.h | 5 ++++- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h index 37465fa80..7b9652469 100644 --- a/src/afs/LINUX/osi_compat.h +++ b/src/afs/LINUX/osi_compat.h @@ -135,15 +135,6 @@ init_once_func(void * foo) { #else #define KALLOC_TYPE GFP_KERNEL #endif - -#ifdef LINUX_KEYRING_SUPPORT -# ifndef KEY_ALLOC_NOT_IN_QUOTA -# define KEY_ALLOC_NOT_IN_QUOTA 1 -# endif -# ifndef KEY_ALLOC_IN_QUOTA -# define KEY_ALLOC_IN_QUOTA 0 -# endif -#endif #endif static inline int diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h index 07c5add2d..9b9508749 100644 --- a/src/afs/sysincludes.h +++ b/src/afs/sysincludes.h @@ -79,7 +79,10 @@ #include #endif #ifndef KEY_ALLOC_IN_QUOTA -#define KEY_ALLOC_IN_QUOTA 1 +/* Before these flags were added in Linux commit v2.6.18-rc1~816, + * key_alloc just took a boolean not_in_quota */ +#define KEY_ALLOC_IN_QUOTA 0 +#define KEY_ALLOC_NOT_IN_QUOTA 1 #endif #endif #endif -- 2.39.5