aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2014-02-27 03:46:18 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2014-07-10 12:34:57 -0400
commit8ce953aa39e2bfd66036a27abdf761c2cb93f02c (patch)
treed7b857bb063ffff69b8decbe94bc69ee57c70fea /drivers/block
parent3e0c78d3466483ee1d6fdb4ce081e00f217db79e (diff)
drbd: silence -Wmissing-prototypes warnings
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_main.c2
-rw-r--r--drivers/block/drbd/drbd_nl.c2
-rw-r--r--drivers/block/drbd/drbd_receiver.c3
-rw-r--r--drivers/block/drbd/drbd_req.h1
-rw-r--r--drivers/block/drbd/drbd_state.c6
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index ed35d52b4763..68ec774d52ea 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2877,7 +2877,7 @@ void drbd_delete_device(struct drbd_device *device)
2877 kref_sub(&device->kref, refs, drbd_destroy_device); 2877 kref_sub(&device->kref, refs, drbd_destroy_device);
2878} 2878}
2879 2879
2880int __init drbd_init(void) 2880static int __init drbd_init(void)
2881{ 2881{
2882 int err; 2882 int err;
2883 2883
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 628167db673b..81949d65fad0 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -2913,7 +2913,7 @@ static struct drbd_connection *the_only_connection(struct drbd_resource *resourc
2913 return list_first_entry(&resource->connections, struct drbd_connection, connections); 2913 return list_first_entry(&resource->connections, struct drbd_connection, connections);
2914} 2914}
2915 2915
2916int nla_put_status_info(struct sk_buff *skb, struct drbd_device *device, 2916static int nla_put_status_info(struct sk_buff *skb, struct drbd_device *device,
2917 const struct sib_info *sib) 2917 const struct sib_info *sib)
2918{ 2918{
2919 struct drbd_resource *resource = device->resource; 2919 struct drbd_resource *resource = device->resource;
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index cfc3d43ca43f..2fcc3af03bd8 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -3371,8 +3371,7 @@ disconnect:
3371 * return: NULL (alg name was "") 3371 * return: NULL (alg name was "")
3372 * ERR_PTR(error) if something goes wrong 3372 * ERR_PTR(error) if something goes wrong
3373 * or the crypto hash ptr, if it worked out ok. */ 3373 * or the crypto hash ptr, if it worked out ok. */
3374static 3374static struct crypto_hash *drbd_crypto_alloc_digest_safe(const struct drbd_device *device,
3375struct crypto_hash *drbd_crypto_alloc_digest_safe(const struct drbd_device *device,
3376 const char *alg, const char *name) 3375 const char *alg, const char *name)
3377{ 3376{
3378 struct crypto_hash *tfm; 3377 struct crypto_hash *tfm;
diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
index 8566cd5866b4..9f6a04080e9f 100644
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
@@ -288,6 +288,7 @@ extern void complete_master_bio(struct drbd_device *device,
288extern void request_timer_fn(unsigned long data); 288extern void request_timer_fn(unsigned long data);
289extern void tl_restart(struct drbd_connection *connection, enum drbd_req_event what); 289extern void tl_restart(struct drbd_connection *connection, enum drbd_req_event what);
290extern void _tl_restart(struct drbd_connection *connection, enum drbd_req_event what); 290extern void _tl_restart(struct drbd_connection *connection, enum drbd_req_event what);
291extern void tl_abort_disk_io(struct drbd_device *device);
291 292
292/* this is in drbd_main.c */ 293/* this is in drbd_main.c */
293extern void drbd_restart_request(struct drbd_request *req); 294extern void drbd_restart_request(struct drbd_request *req);
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 6629f4668102..a7772e2aba7e 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -410,7 +410,7 @@ _drbd_request_state(struct drbd_device *device, union drbd_state mask,
410 return rv; 410 return rv;
411} 411}
412 412
413static void print_st(struct drbd_device *device, char *name, union drbd_state ns) 413static void print_st(struct drbd_device *device, const char *name, union drbd_state ns)
414{ 414{
415 drbd_err(device, " %s = { cs:%s ro:%s/%s ds:%s/%s %c%c%c%c%c%c }\n", 415 drbd_err(device, " %s = { cs:%s ro:%s/%s ds:%s/%s %c%c%c%c%c%c }\n",
416 name, 416 name,
@@ -1606,7 +1606,7 @@ static int w_after_conn_state_ch(struct drbd_work *w, int unused)
1606 return 0; 1606 return 0;
1607} 1607}
1608 1608
1609void conn_old_common_state(struct drbd_connection *connection, union drbd_state *pcs, enum chg_state_flags *pf) 1609static void conn_old_common_state(struct drbd_connection *connection, union drbd_state *pcs, enum chg_state_flags *pf)
1610{ 1610{
1611 enum chg_state_flags flags = ~0; 1611 enum chg_state_flags flags = ~0;
1612 struct drbd_peer_device *peer_device; 1612 struct drbd_peer_device *peer_device;
@@ -1695,7 +1695,7 @@ conn_is_valid_transition(struct drbd_connection *connection, union drbd_state ma
1695 return rv; 1695 return rv;
1696} 1696}
1697 1697
1698void 1698static void
1699conn_set_state(struct drbd_connection *connection, union drbd_state mask, union drbd_state val, 1699conn_set_state(struct drbd_connection *connection, union drbd_state mask, union drbd_state val,
1700 union drbd_state *pns_min, union drbd_state *pns_max, enum chg_state_flags flags) 1700 union drbd_state *pns_min, union drbd_state *pns_max, enum chg_state_flags flags)
1701{ 1701{