hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Gruenbacher 2010-12-08 01:06:16 +01:00 committed by Philipp Reisner
parent 116676ca62
commit c8b325632f
3 changed files with 6 additions and 5 deletions
drivers/block/drbd
drbd_main.cdrbd_strings.c
include/linux
drbd.h

5
drivers/block/drbd/drbd_main.c
View File

@ -510,8 +510,9 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state
int drbd_send_state_req(struct drbd_conf *, int drbd_send_state_req(struct drbd_conf *,
union drbd_state, union drbd_state); union drbd_state, union drbd_state);
static enum drbd_state_ret_codes _req_st_cond(struct drbd_conf *mdev, static enum drbd_state_rv
union drbd_state mask, union drbd_state val) _req_st_cond(struct drbd_conf *mdev, union drbd_state mask,
union drbd_state val)
{ {
union drbd_state os, ns; union drbd_state os, ns;
unsigned long flags; unsigned long flags;

2
drivers/block/drbd/drbd_strings.c
View File

@ -107,7 +107,7 @@ const char *drbd_disk_str(enum drbd_disk_state s)
return s > D_UP_TO_DATE ? "TOO_LARGE" : drbd_disk_s_names[s]; return s > D_UP_TO_DATE ? "TOO_LARGE" : drbd_disk_s_names[s];
} }
const char *drbd_set_st_err_str(enum drbd_state_ret_codes err) const char *drbd_set_st_err_str(enum drbd_state_rv err)
{ {
return err <= SS_AFTER_LAST_ERROR ? "TOO_SMALL" : return err <= SS_AFTER_LAST_ERROR ? "TOO_SMALL" :
err > SS_TWO_PRIMARIES ? "TOO_LARGE" err > SS_TWO_PRIMARIES ? "TOO_LARGE"

4
include/linux/drbd.h
View File

@ -270,7 +270,7 @@ union drbd_state {
unsigned int i; unsigned int i;
}; };
enum drbd_state_ret_codes { enum drbd_state_rv {
SS_CW_NO_NEED = 4, SS_CW_NO_NEED = 4,
SS_CW_SUCCESS = 3, SS_CW_SUCCESS = 3,
SS_NOTHING_TO_DO = 2, SS_NOTHING_TO_DO = 2,
@ -301,7 +301,7 @@ enum drbd_state_ret_codes {
extern const char *drbd_conn_str(enum drbd_conns); extern const char *drbd_conn_str(enum drbd_conns);
extern const char *drbd_role_str(enum drbd_role); extern const char *drbd_role_str(enum drbd_role);
extern const char *drbd_disk_str(enum drbd_disk_state); extern const char *drbd_disk_str(enum drbd_disk_state);
extern const char *drbd_set_st_err_str(enum drbd_state_ret_codes); extern const char *drbd_set_st_err_str(enum drbd_state_rv);
#define SHARED_SECRET_MAX 64 #define SHARED_SECRET_MAX 64