diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2011-09-01 07:18:31 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-02-17 10:50:37 -0500 |
commit | d9f65229f6257842eb7badef015719432b3d16a6 (patch) | |
tree | 60b5b8f841f47264d1ef35f537e45016c9e9608a | |
parent | 137975c13c79f6048aa33a0bf5c7656356ca1e8b (diff) |
drbd: Move string function prototypes from linux/drbd.h to drbd_string.h
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 1 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_strings.c | 1 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_strings.h | 9 | ||||
-rw-r--r-- | include/linux/drbd.h | 6 |
4 files changed, 11 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 7293ea5ccabb..0840e9c96f42 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <linux/prefetch.h> | 45 | #include <linux/prefetch.h> |
46 | #include <linux/drbd_genl_api.h> | 46 | #include <linux/drbd_genl_api.h> |
47 | #include <linux/drbd.h> | 47 | #include <linux/drbd.h> |
48 | #include "drbd_strings.h" | ||
48 | #include "drbd_state.h" | 49 | #include "drbd_state.h" |
49 | #include "drbd_protocol.h" | 50 | #include "drbd_protocol.h" |
50 | 51 | ||
diff --git a/drivers/block/drbd/drbd_strings.c b/drivers/block/drbd/drbd_strings.c index 58e08ff2b2ce..80b0f63c7075 100644 --- a/drivers/block/drbd/drbd_strings.c +++ b/drivers/block/drbd/drbd_strings.c | |||
@@ -24,6 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/drbd.h> | 26 | #include <linux/drbd.h> |
27 | #include "drbd_strings.h" | ||
27 | 28 | ||
28 | static const char *drbd_conn_s_names[] = { | 29 | static const char *drbd_conn_s_names[] = { |
29 | [C_STANDALONE] = "StandAlone", | 30 | [C_STANDALONE] = "StandAlone", |
diff --git a/drivers/block/drbd/drbd_strings.h b/drivers/block/drbd/drbd_strings.h new file mode 100644 index 000000000000..f9923cc88afb --- /dev/null +++ b/drivers/block/drbd/drbd_strings.h | |||
@@ -0,0 +1,9 @@ | |||
1 | #ifndef __DRBD_STRINGS_H | ||
2 | #define __DRBD_STRINGS_H | ||
3 | |||
4 | extern const char *drbd_conn_str(enum drbd_conns); | ||
5 | extern const char *drbd_role_str(enum drbd_role); | ||
6 | extern const char *drbd_disk_str(enum drbd_disk_state); | ||
7 | extern const char *drbd_set_st_err_str(enum drbd_state_rv); | ||
8 | |||
9 | #endif /* __DRBD_STRINGS_H */ | ||
diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 6f60136da873..3dbe9bd57a09 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h | |||
@@ -327,12 +327,6 @@ enum drbd_state_rv { | |||
327 | SS_AFTER_LAST_ERROR = -22, /* Keep this at bottom */ | 327 | SS_AFTER_LAST_ERROR = -22, /* Keep this at bottom */ |
328 | }; | 328 | }; |
329 | 329 | ||
330 | /* from drbd_strings.c */ | ||
331 | extern const char *drbd_conn_str(enum drbd_conns); | ||
332 | extern const char *drbd_role_str(enum drbd_role); | ||
333 | extern const char *drbd_disk_str(enum drbd_disk_state); | ||
334 | extern const char *drbd_set_st_err_str(enum drbd_state_rv); | ||
335 | |||
336 | #define SHARED_SECRET_MAX 64 | 330 | #define SHARED_SECRET_MAX 64 |
337 | 331 | ||
338 | #define MDF_CONSISTENT (1 << 0) | 332 | #define MDF_CONSISTENT (1 << 0) |