From patchwork Sun Aug 10 20:51:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 4705111 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 967089F375 for ; Sun, 10 Aug 2014 20:52:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE398201B9 for ; Sun, 10 Aug 2014 20:52:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03D1420173 for ; Sun, 10 Aug 2014 20:52:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751796AbaHJUwA (ORCPT ); Sun, 10 Aug 2014 16:52:00 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:51949 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751692AbaHJUv5 (ORCPT ); Sun, 10 Aug 2014 16:51:57 -0400 Received: by mail-wg0-f52.google.com with SMTP id a1so7586283wgh.11 for ; Sun, 10 Aug 2014 13:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=MNhUFxta912+trf3tQx3JqFGu5NpnP6zGrN8CNAUV2w=; b=NAoz4XW8ObbkIgfH0xepHgrAj7d4A8Ckh0yreRoqUEdIp6GnC1mda9jUoqTdYT8fbP yk+yEl1U3cXq81cYvdJC6KCF0cSa9qoLNVnPaAkyxkld0dGvtAvVx2MivH7Qkq+aRyLW Phr4HlIKzFN/KZxZsxUh4r9pe7uHLKfitYqxy6jjqEXBrRhNodLok2OOUCLOH9YVWxcK GoFSKoaMWLg6RzWuokijvow9VjZJkTVSmmP62MqgVudcA9+IpRfE3biM0mzOUcADRioG te0VIe44ChHjULgFLXBy2WsGmiJ/mYBLjTFpOjGs428BglDSLjTCRdwAUoMPqGixEekI ZTKQ== X-Received: by 10.180.73.139 with SMTP id l11mr19978656wiv.30.1407703916562; Sun, 10 Aug 2014 13:51:56 -0700 (PDT) Received: from ramsan.of.borg (d54C154A7.access.telenet.be. [84.193.84.167]) by mx.google.com with ESMTPSA id u5sm35120535wia.17.2014.08.10.13.51.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 Aug 2014 13:51:55 -0700 (PDT) From: Geert Uytterhoeven To: Steve French , Sachin Prabhu Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 2/2] cifs: Remove unused sess_auth_kerberos() for !CONFIG_CIFS_UPCALL case Date: Sun, 10 Aug 2014 22:51:49 +0200 Message-Id: <1407703909-24350-2-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407703909-24350-1-git-send-email-geert@linux-m68k.org> References: <1407703909-24350-1-git-send-email-geert@linux-m68k.org> MIME-Version: 1.0 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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