From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Steve French <sfrench@samba.org>, Sachin Prabhu <sprabhu@redhat.com>
Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 2/2] cifs: Remove unused sess_auth_kerberos() for !CONFIG_CIFS_UPCALL case
Date: Sun, 10 Aug 2014 22:51:49 +0200 [thread overview]
Message-ID: <1407703909-24350-2-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1407703909-24350-1-git-send-email-geert@linux-m68k.org>
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
prev parent reply other threads:[~2014-08-10 20:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-10 20:51 [PATCH 1/2] cifs: Remove unused sess_auth_lanman() for !CONFIG_CIFS_WEAK_PW_HASH case Geert Uytterhoeven
2014-08-10 20:51 ` Geert Uytterhoeven [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407703909-24350-2-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfrench@samba.org \
--cc=sprabhu@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®