2008-10-12 04:11:58

by Adrian Bunk

Subject: [2.6 patch] add key_revoke() dummy for KEYS=n

This patch fixes the following build error with CONFIG_KEYS=n, caused by
commit dfd15c46a6c2cafb006183c0c14f07e59eee4ac0
(cifs: explicitly revoke SPNEGO key after session setup):

<-- snip -->

...
CC [M] fs/cifs/sess.o
fs/cifs/sess.c: In function 'CIFS_SessSetup':
fs/cifs/sess.c:628: error: implicit declaration of function 'key_revoke'
make[3]: *** [fs/cifs/sess.o] Error 1

<-- snip -->


Signed-off-by: Adrian Bunk <[email protected]>

---

diff --git a/include/linux/key.h b/include/linux/key.h
index c45c962..1b70e35 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -299,6 +299,7 @@ extern void key_init(void);
#define key_validate(k) 0
#define key_serial(k) 0
#define key_get(k) ({ NULL; })
+#define key_revoke(k) do { } while(0)
#define key_put(k) do { } while(0)
#define key_ref_put(k) do { } while(0)
#define make_key_ref(k, p) ({ NULL; })

2008-10-12 11:49:20

by Jeff Layton

Subject: Re: [2.6 patch] add key_revoke() dummy for KEYS=n

On Sun, 12 Oct 2008 07:10:50 +0300
Adrian Bunk <[email protected]> wrote:

> This patch fixes the following build error with CONFIG_KEYS=n, caused by
> commit dfd15c46a6c2cafb006183c0c14f07e59eee4ac0
> (cifs: explicitly revoke SPNEGO key after session setup):
>
> <-- snip -->
>
> ...
> CC [M] fs/cifs/sess.o
> fs/cifs/sess.c: In function 'CIFS_SessSetup':
> fs/cifs/sess.c:628: error: implicit declaration of function 'key_revoke'
> make[3]: *** [fs/cifs/sess.o] Error 1
>
> <-- snip -->
>
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
>
> diff --git a/include/linux/key.h b/include/linux/key.h
> index c45c962..1b70e35 100644
> --- a/include/linux/key.h
> +++ b/include/linux/key.h
> @@ -299,6 +299,7 @@ extern void key_init(void);
> #define key_validate(k) 0
> #define key_serial(k) 0
> #define key_get(k) ({ NULL; })
> +#define key_revoke(k) do { } while(0)
> #define key_put(k) do { } while(0)
> #define key_ref_put(k) do { } while(0)
> #define make_key_ref(k, p) ({ NULL; })
>

Acked-by: Jeff Layton <[email protected]>