aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2010-12-07 19:06:16 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 05:36:18 -0500
commitc8b325632f0e5ffdaeca3d1f3be77c9399316a40 (patch)
tree3b86d7a6a9b180e05a78c89d9a83ca1b93aa5cbe /drivers/block/drbd
parent116676ca621a862a8124969772f4dd61c8b40eee (diff)
drbd: Rename enum drbd_state_ret_codes to enum drbd_state_rv
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r--drivers/block/drbd/drbd_main.c5
-rw-r--r--drivers/block/drbd/drbd_strings.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 8d69e3a1b3c2..cddf311b7429 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -510,8 +510,9 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state
510int drbd_send_state_req(struct drbd_conf *, 510int drbd_send_state_req(struct drbd_conf *,
511 union drbd_state, union drbd_state); 511 union drbd_state, union drbd_state);
512 512
513static enum drbd_state_ret_codes _req_st_cond(struct drbd_conf *mdev, 513static enum drbd_state_rv
514 union drbd_state mask, union drbd_state val) 514_req_st_cond(struct drbd_conf *mdev, union drbd_state mask,
515 union drbd_state val)
515{ 516{
516 union drbd_state os, ns; 517 union drbd_state os, ns;
517 unsigned long flags; 518 unsigned long flags;
diff --git a/drivers/block/drbd/drbd_strings.c b/drivers/block/drbd/drbd_strings.c
index 5b970adc3b6f..c44a2a602772 100644
--- a/drivers/block/drbd/drbd_strings.c
+++ b/drivers/block/drbd/drbd_strings.c
@@ -107,7 +107,7 @@ const char *drbd_disk_str(enum drbd_disk_state s)
107 return s > D_UP_TO_DATE ? "TOO_LARGE" : drbd_disk_s_names[s]; 107 return s > D_UP_TO_DATE ? "TOO_LARGE" : drbd_disk_s_names[s];
108} 108}
109 109
110const char *drbd_set_st_err_str(enum drbd_state_ret_codes err) 110const char *drbd_set_st_err_str(enum drbd_state_rv err)
111{ 111{
112 return err <= SS_AFTER_LAST_ERROR ? "TOO_SMALL" : 112 return err <= SS_AFTER_LAST_ERROR ? "TOO_SMALL" :
113 err > SS_TWO_PRIMARIES ? "TOO_LARGE" 113 err > SS_TWO_PRIMARIES ? "TOO_LARGE"