cifs: fix build on !CONFIG_KEYS

From 9d65371d47bc0285a557f279d402764f73551d3c Mon Sep 17 00:00:00 2001

hi,

find a quick build fix for CIFS below - you might have it already. Please double-check.

----------->
From 9d65371d47bc0285a557f279d402764f73551d3c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <[email protected]>
Date: Sun, 12 Oct 2008 13:01:52 +0200
Subject: [PATCH] cifs: fix build on !CONFIG_KEYS
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

CIFS has keys infrastructure dependencies:

fs/cifs/sess.c: In function ‘CIFS_SessSetup’:
fs/cifs/sess.c:628: error: implicit declaration of function ‘key_revoke’

So express that dependency in the Kconfig.

Signed-off-by Ingo Molnar <[email protected]>

---
 fs/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

fs/Kconfig +1 -0

index 40183d9..c0eade5 100644
@@ -1876,6 +1876,7 @@ config SMB_NLS_REMOTE
 config CIFS
 	tristate "CIFS support (advanced network filesystem, SMBFS successor)"
 	depends on INET
+	depends on KEYS
 	select NLS
 	help
 	  This is the client VFS module for the Common Internet File System

Quoted 5 lines · Ingo Molnar

hi,

find a quick build fix for CIFS below - you might have it already. Please double-check.

Heh, I've just sent another fix for the same issue. :-)

Thanks,
Rafael

Quoted 26 lines

----------->
From 9d65371d47bc0285a557f279d402764f73551d3c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <[email protected]>
Date: Sun, 12 Oct 2008 13:01:52 +0200
Subject: [PATCH] cifs: fix build on !CONFIG_KEYS
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

CIFS has keys infrastructure dependencies:

fs/cifs/sess.c: In function 'CIFS_SessSetup':
fs/cifs/sess.c:628: error: implicit declaration of function 'key_revoke'

So express that dependency in the Kconfig.

Signed-off-by Ingo Molnar <[email protected]>

---
 fs/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

fs/Kconfig +0 -0

index 40183d9..c0eade5 100644

fs/Kconfig config SMB_NLS_REMOTE · line 1882

Quoted 7 lines

fs/Kconfig +1 -0

@@ -1876,6 +1876,7 @@ config SMB_NLS_REMOTE
 config CIFS
      tristate "CIFS support (advanced network filesystem, SMBFS successor)"
      depends on INET
+     depends on KEYS
      select NLS
      help
        This is the client VFS module for the Common Internet File System

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Dang it. I got to this one late. I literally -just- fixed it locally.

- Steven

Quoted 52 lines · Rafael J. Wysocki

Quoted 5 lines · Ingo Molnar

hi,

find a quick build fix for CIFS below - you might have it already. Please double-check.

Heh, I've just sent another fix for the same issue. :-)

Thanks,
Rafael

Quoted 26 lines

----------->
From 9d65371d47bc0285a557f279d402764f73551d3c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <[email protected]>
Date: Sun, 12 Oct 2008 13:01:52 +0200
Subject: [PATCH] cifs: fix build on !CONFIG_KEYS
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

CIFS has keys infrastructure dependencies:

fs/cifs/sess.c: In function 'CIFS_SessSetup':
fs/cifs/sess.c:628: error: implicit declaration of function 'key_revoke'

So express that dependency in the Kconfig.

Signed-off-by Ingo Molnar <[email protected]>

---
 fs/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

fs/Kconfig +0 -0

index 40183d9..c0eade5 100644

fs/Kconfig config SMB_NLS_REMOTE · line 1882

Quoted 7 lines

fs/Kconfig +1 -0

@@ -1876,6 +1876,7 @@ config SMB_NLS_REMOTE
 config CIFS
      tristate "CIFS support (advanced network filesystem, SMBFS successor)"
      depends on INET
+     depends on KEYS
      select NLS
      help
        This is the client VFS module for the Common Internet File System

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Hmm, which fix is correct though? Depending on KEYS in Kconfig, or adding a nop for it?

Quoted 58 lines

Dang it. I got to this one late. I literally -just- fixed it locally.

- Steven

Quoted 52 lines · Rafael J. Wysocki

Quoted 5 lines · Ingo Molnar

hi,

find a quick build fix for CIFS below - you might have it already. Please double-check.

Heh, I've just sent another fix for the same issue. :-)

Thanks,
Rafael

Quoted 26 lines

----------->
From 9d65371d47bc0285a557f279d402764f73551d3c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <[email protected]>
Date: Sun, 12 Oct 2008 13:01:52 +0200
Subject: [PATCH] cifs: fix build on !CONFIG_KEYS
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

CIFS has keys infrastructure dependencies:

fs/cifs/sess.c: In function 'CIFS_SessSetup':
fs/cifs/sess.c:628: error: implicit declaration of function 'key_revoke'

So express that dependency in the Kconfig.

Signed-off-by Ingo Molnar <[email protected]>

---
 fs/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

fs/Kconfig +0 -0

index 40183d9..c0eade5 100644

fs/Kconfig config SMB_NLS_REMOTE · line 1882

Quoted 7 lines

fs/Kconfig +1 -0

@@ -1876,6 +1876,7 @@ config SMB_NLS_REMOTE
 config CIFS
      tristate "CIFS support (advanced network filesystem, SMBFS successor)"
      depends on INET
+     depends on KEYS
      select NLS
      help
        This is the client VFS module for the Common Internet File System

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Quoted 2 lines · Steven Noonan

Hmm, which fix is correct though? Depending on KEYS in Kconfig, or adding a nop for it?

Well, according to git-blame the key_revoke() has been added to fs/cifs/sess.c only recently while key_put() was there before. For this reason I think it's correct to handle key_revoke() in analogy with key_put(), ie. add an empty definition for it if CONFIG_KEYS is unset.

Thanks,
Rafael