diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-11-25 08:00:38 -0500 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2012-12-05 14:13:11 -0500 |
commit | b1a6dc21d1a731fdb71fcd683ef856c6af0b3f23 (patch) | |
tree | e8bcd48d9deee185fb199c6a91758bbca35a1ddf /fs | |
parent | ee13b2ba7488475b47ae8dab2eebc4f5fd6838c5 (diff) |
cifs: remove uneeded __KERNEL__ block from cifsacl.h
...and make those symbols static in cifsacl.c. Nothing outside
of that file refers to them.
Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/cifsacl.c | 4 | ||||
-rw-r--r-- | 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 9adcdb5a1001..42b3fe981a0a 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c | |||
@@ -42,7 +42,7 @@ static const struct cifs_sid sid_authusers = { | |||
42 | /* group users */ | 42 | /* group users */ |
43 | static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} }; | 43 | static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} }; |
44 | 44 | ||
45 | const struct cred *root_cred; | 45 | static const struct cred *root_cred; |
46 | 46 | ||
47 | static void | 47 | static void |
48 | shrink_idmap_tree(struct rb_root *root, int nr_to_scan, int *nr_rem, | 48 | 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) | |||
187 | kfree(key->payload.data); | 187 | kfree(key->payload.data); |
188 | } | 188 | } |
189 | 189 | ||
190 | struct key_type cifs_idmap_key_type = { | 190 | static struct key_type cifs_idmap_key_type = { |
191 | .name = "cifs.idmap", | 191 | .name = "cifs.idmap", |
192 | .instantiate = cifs_idmap_key_instantiate, | 192 | .instantiate = cifs_idmap_key_instantiate, |
193 | .destroy = cifs_idmap_key_destroy, | 193 | .destroy = cifs_idmap_key_destroy, |
diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index 8b980cd445c0..249c94f39635 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h | |||
@@ -109,9 +109,4 @@ struct cifs_sid_id { | |||
109 | struct cifs_sid sid; | 109 | struct cifs_sid sid; |
110 | }; | 110 | }; |
111 | 111 | ||
112 | #ifdef __KERNEL__ | ||
113 | extern struct key_type cifs_idmap_key_type; | ||
114 | extern const struct cred *root_cred; | ||
115 | #endif /* KERNEL */ | ||
116 | |||
117 | #endif /* _CIFSACL_H */ | 112 | #endif /* _CIFSACL_H */ |