Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8b32563 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Rename enum drbd_state_ret_codes to enum drbd_state_rv 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 116676ca

drivers/block/drbd/drbd_main.c

+3 −2
Original line number Diff line number Diff line
@@ -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 *,

			union drbd_state, union drbd_state);



static enum drbd_state_ret_codes _req_st_cond(struct drbd_conf *mdev,

				    union drbd_state mask, union drbd_state val)

static enum drbd_state_rv

_req_st_cond(struct drbd_conf *mdev, union drbd_state mask,

	     union drbd_state val)

{

	union drbd_state os, ns;

	unsigned long flags;

drivers/block/drbd/drbd_strings.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

}



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" :

	       err > SS_TWO_PRIMARIES ? "TOO_LARGE"

include/linux/drbd.h

+2 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ union drbd_state { 
	unsigned int i;

};



enum drbd_state_ret_codes {

enum drbd_state_rv {

	SS_CW_NO_NEED = 4,

	SS_CW_SUCCESS = 3,

	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_role_str(enum drbd_role);

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