aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-10-18 16:48:22 -0400
committerDavid S. Miller <davem@davemloft.net>2013-10-19 19:12:11 -0400
commit348662a1429f95ed2d488c939c324ec152638742 (patch)
treee94d2acc47df1ad37e811f71c058fdb0c89c970f /net/ceph
parent47d27aad44169372f358cda88a223883f6760fa5 (diff)
net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes
There are a mix of function prototypes with and without extern in the kernel sources. Standardize on not using extern for function prototypes. Function prototypes don't need to be written with extern. extern is assumed by the compiler. Its use is as unnecessary as using auto to declare automatic/local variables in a block. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/auth_none.h2
-rw-r--r--net/ceph/auth_x.h2
-rw-r--r--net/ceph/crypto.h48
3 files changed, 25 insertions, 27 deletions
diff --git a/net/ceph/auth_none.h b/net/ceph/auth_none.h
index ed7d088b1bc9..059a3ce4b53f 100644
--- a/net/ceph/auth_none.h
+++ b/net/ceph/auth_none.h
@@ -23,7 +23,7 @@ struct ceph_auth_none_info {
23 struct ceph_none_authorizer au; /* we only need one; it's static */ 23 struct ceph_none_authorizer au; /* we only need one; it's static */
24}; 24};
25 25
26extern int ceph_auth_none_init(struct ceph_auth_client *ac); 26int ceph_auth_none_init(struct ceph_auth_client *ac);
27 27
28#endif 28#endif
29 29
diff --git a/net/ceph/auth_x.h b/net/ceph/auth_x.h
index c5a058da7ac8..65ee72082d99 100644
--- a/net/ceph/auth_x.h
+++ b/net/ceph/auth_x.h
@@ -45,7 +45,7 @@ struct ceph_x_info {
45 struct ceph_x_authorizer auth_authorizer; 45 struct ceph_x_authorizer auth_authorizer;
46}; 46};
47 47
48extern int ceph_x_init(struct ceph_auth_client *ac); 48int ceph_x_init(struct ceph_auth_client *ac);
49 49
50#endif 50#endif
51 51
diff --git a/net/ceph/crypto.h b/net/ceph/crypto.h
index 3572dc518bc9..d1498224c49d 100644
--- a/net/ceph/crypto.h
+++ b/net/ceph/crypto.h
@@ -20,34 +20,32 @@ static inline void ceph_crypto_key_destroy(struct ceph_crypto_key *key)
20 kfree(key->key); 20 kfree(key->key);
21} 21}
22 22
23extern int ceph_crypto_key_clone(struct ceph_crypto_key *dst, 23int ceph_crypto_key_clone(struct ceph_crypto_key *dst,
24 const struct ceph_crypto_key *src); 24 const struct ceph_crypto_key *src);
25extern int ceph_crypto_key_encode(struct ceph_crypto_key *key, 25int ceph_crypto_key_encode(struct ceph_crypto_key *key, void **p, void *end);
26 void **p, void *end); 26int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end);
27extern int ceph_crypto_key_decode(struct ceph_crypto_key *key, 27int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *in);
28 void **p, void *end);
29extern int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *in);
30 28
31/* crypto.c */ 29/* crypto.c */
32extern int ceph_decrypt(struct ceph_crypto_key *secret, 30int ceph_decrypt(struct ceph_crypto_key *secret,
33 void *dst, size_t *dst_len, 31 void *dst, size_t *dst_len,
34 const void *src, size_t src_len); 32 const void *src, size_t src_len);
35extern int ceph_encrypt(struct ceph_crypto_key *secret, 33int ceph_encrypt(struct ceph_crypto_key *secret,
36 void *dst, size_t *dst_len, 34 void *dst, size_t *dst_len,
37 const void *src, size_t src_len); 35 const void *src, size_t src_len);
38extern int ceph_decrypt2(struct ceph_crypto_key *secret, 36int ceph_decrypt2(struct ceph_crypto_key *secret,
39 void *dst1, size_t *dst1_len, 37 void *dst1, size_t *dst1_len,
40 void *dst2, size_t *dst2_len, 38 void *dst2, size_t *dst2_len,
41 const void *src, size_t src_len); 39 const void *src, size_t src_len);
42extern int ceph_encrypt2(struct ceph_crypto_key *secret, 40int ceph_encrypt2(struct ceph_crypto_key *secret,
43 void *dst, size_t *dst_len, 41 void *dst, size_t *dst_len,
44 const void *src1, size_t src1_len, 42 const void *src1, size_t src1_len,
45 const void *src2, size_t src2_len); 43 const void *src2, size_t src2_len);
46extern int ceph_crypto_init(void); 44int ceph_crypto_init(void);
47extern void ceph_crypto_shutdown(void); 45void ceph_crypto_shutdown(void);
48 46
49/* armor.c */ 47/* armor.c */
50extern int ceph_armor(char *dst, const char *src, const char *end); 48int ceph_armor(char *dst, const char *src, const char *end);
51extern int ceph_unarmor(char *dst, const char *src, const char *end); 49int ceph_unarmor(char *dst, const char *src, const char *end);
52 50
53#endif 51#endif