diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-11-25 08:00:38 -0500 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2012-12-05 13:13:11 -0600 |
| commit | b1a6dc21d1a731fdb71fcd683ef856c6af0b3f23 (patch) | |
| tree | e8bcd48d9deee185fb199c6a91758bbca35a1ddf /fs | |
| parent | ee13b2ba7488475b47ae8dab2eebc4f5fd6838c5 (diff) | |
| download | linux-b1a6dc21d1a731fdb71fcd683ef856c6af0b3f23.tar.gz linux-b1a6dc21d1a731fdb71fcd683ef856c6af0b3f23.tar.bz2 linux-b1a6dc21d1a731fdb71fcd683ef856c6af0b3f23.zip | |
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 = { /* 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 8b980cd445c0..249c94f39635 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 */ |