[PATCH 1/2] cifs: Remove unused sess_auth_lanman() for !CONFIG_CIFS_WEAK_PW_HASH case

[PATCH 1/2] cifs: Remove unused sess_auth_lanman() for !CONFIG_CIFS_WEAK_PW_HASH case

[Geert Uytterhoeven]

If CONFIG_CIFS_WEAK_PW_HASH is not set:

fs/cifs/sess.c:751: warning: ‘sess_auth_lanman’ defined but not used

Commit cc87c47d9d7ac25554aa81cd8ded56e75f79c198 ("cifs: Separate
rawntlmssp auth from CIFS_SessSetup()") removed the sole user of the
dummy version of sess_auth_lanman() in the non-CONFIG_CIFS_WEAK_PW_HASH
case, but forgot to remove the actual function definition.

Remove the dummy version to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 fs/cifs/sess.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 39ee32688eac..8090ad3c5ea5 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -743,16 +743,7 @@ out:
 	sess_data->func = NULL;
 	sess_free_buffer(sess_data);
 }
-
-#else
-
-static void
-sess_auth_lanman(struct sess_data *sess_data)
-{
-	sess_data->result = -EOPNOTSUPP;
-	sess_data->func = NULL;
-}
-#endif
+#endif /* CONFIG_CIFS_WEAK_PW_HASH */
 
 static void
 sess_auth_ntlm(struct sess_data *sess_data)
-- 
1.9.1

[PATCH 2/2] cifs: Remove unused sess_auth_kerberos() for !CONFIG_CIFS_UPCALL case

[Geert Uytterhoeven]

If CONFIG_CIFS_UPCALL is not set:

fs/cifs/sess.c:1100: warning: ‘sess_auth_kerberos’ defined but not used

Commit cc87c47d9d7ac25554aa81cd8ded56e75f79c198 ("cifs: Separate
rawntlmssp auth from CIFS_SessSetup()") removed the sole user of the
dummy version of sess_auth_kerberos() in the non-CONFIG_CIFS_UPCALL
case, but forgot to remove the actual function definition.

Remove the dummy version to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 fs/cifs/sess.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 8090ad3c5ea5..31817bd5f4b0 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -1092,17 +1092,7 @@ out:
 	kfree(ses->auth_key.response);
 	ses->auth_key.response = NULL;
 }
-
-#else
-
-static void
-sess_auth_kerberos(struct sess_data *sess_data)
-{
-	cifs_dbg(VFS, "Kerberos negotiated but upcall support disabled!\n");
-	sess_data->result = -ENOSYS;
-	sess_data->func = NULL;
-}
-#endif /* ! CONFIG_CIFS_UPCALL */
+#endif /* CONFIG_CIFS_UPCALL */
 
 /*
  * The required kvec buffers have to be allocated before calling this
-- 
1.9.1