From d78b6ff86aea39fa46953a3b967d96436ff13548 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Sun, 25 Nov 2012 08:00:38 -0500
Subject: [PATCH] --- yaml --- r: 339459 b: refs/heads/master c:
 b1a6dc21d1a731fdb71fcd683ef856c6af0b3f23 h: refs/heads/master i:   339457:
 82b2acfc68270a1a5fde9f97e5a549fb50e7bdbe   339455:
 05e8cd9412bdb85ffd57ff78a13899194f70a65e v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/cifsacl.c | 4 ++--
 trunk/fs/cifs/cifsacl.h | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index df17ec0741b3..8ba622d16d4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee13b2ba7488475b47ae8dab2eebc4f5fd6838c5
+refs/heads/master: b1a6dc21d1a731fdb71fcd683ef856c6af0b3f23
diff --git a/trunk/fs/cifs/cifsacl.c b/trunk/fs/cifs/cifsacl.c
index 9adcdb5a1001..42b3fe981a0a 100644
--- a/trunk/fs/cifs/cifsacl.c
+++ b/trunk/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/trunk/fs/cifs/cifsacl.h b/trunk/fs/cifs/cifsacl.h
index 8b980cd445c0..249c94f39635 100644
--- a/trunk/fs/cifs/cifsacl.h
+++ b/trunk/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 */