---

yaml --- r: 339459 b: refs/heads/master c: b1a6dc2 h: refs/heads/master i: 339457: 82b2acf 339455: 05e8cd9 v: v3
git-mirror · Dec 5, 2012 · d78b6ff · d78b6ff
1 parent 9400045
commit d78b6ff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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 */