From patchwork Wed Oct 17 18:09:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1607471 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id AAABC3FE36 for ; Wed, 17 Oct 2012 18:09:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757586Ab2JQSJ1 (ORCPT ); Wed, 17 Oct 2012 14:09:27 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:64991 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757549Ab2JQSJO (ORCPT ); Wed, 17 Oct 2012 14:09:14 -0400 Received: by mail-gg0-f174.google.com with SMTP id k5so2163517ggd.19 for ; Wed, 17 Oct 2012 11:09:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=785DC8J5mUjgetK17z69BdD6GzVQAJhmpTdM+3JrZu0=; b=Q64oatUdaEY2v8GaitAMiEXLv2l4DPyQDELlrck2fTv7A4eRX5RqWhTt2G3eHRfLos VCGmylHCURQm6x7XIpnFNxR0N6TTZhJzTGrGfk/jRWyHPwZt+wEEepsrR6Uh1ymLioNV J4nJ4tNmXpyTZPzizaJrHKpTLCnVibYl5sJ2Cy1sR4WIzz7nUIhwDwImO6e0JDlFbESn 8Jk9YON/QOS2uLuXyJN19Hn1W64fP6OogbJP37ikNFjscMz4yGFmxBPkPSFB1osJ9MxH y2f2ZGeyFExEtVhOmxiA0R4MZgNHvHkF569SaxsG4eDDGNWT41dUF2YG/ZutT4sLjZ2v NbKA== Received: by 10.101.180.39 with SMTP id h39mr4834759anp.75.1350497354369; Wed, 17 Oct 2012 11:09:14 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id k63sm9397062yhj.20.2012.10.17.11.09.13 (version=SSLv3 cipher=OTHER); Wed, 17 Oct 2012 11:09:13 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, shirishpargaonkar@gmail.com Subject: [PATCH 4/7] cifs: remove uneeded __KERNEL__ block from cifsacl.h Date: Wed, 17 Oct 2012 14:09:00 -0400 Message-Id: <1350497343-7155-5-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1350497343-7155-1-git-send-email-jlayton@redhat.com> References: <1350497343-7155-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQm9W3D0hkzH8oQpZ35q4hlb/7WF0Ui4e8+RmdFE5aiaQNFzMw/+IEHFCn5MOOe/pdruMWI8 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org ...and make those symbols static in cifsacl.c. Nothing outside of that file refers to them. Signed-off-by: Jeff Layton --- fs/cifs/cifsacl.c | 4 ++-- fs/cifs/cifsacl.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 9adcdb5..42b3fe9 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -42,7 +42,7 @@ static const struct cifs_sid sid_authusers = { /* group users */ static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} }; -const struct cred *root_cred; +static const struct cred *root_cred; static void shrink_idmap_tree(struct rb_root *root, int nr_to_scan, int *nr_rem, @@ -187,7 +187,7 @@ cifs_idmap_key_destroy(struct key *key) kfree(key->payload.data); } -struct key_type cifs_idmap_key_type = { +static struct key_type cifs_idmap_key_type = { .name = "cifs.idmap", .instantiate = cifs_idmap_key_instantiate, .destroy = cifs_idmap_key_destroy, diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index 8b980cd..249c94f 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h @@ -109,9 +109,4 @@ struct cifs_sid_id { struct cifs_sid sid; }; -#ifdef __KERNEL__ -extern struct key_type cifs_idmap_key_type; -extern const struct cred *root_cred; -#endif /* KERNEL */ - #endif /* _CIFSACL_H */