Commit b8907339 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Moved the state functions into its own source file 



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

drivers/block/drbd/Makefile

+1 −1
Original line number Diff line number Diff line 
drbd-y := drbd_bitmap.o drbd_proc.o

drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o

drbd-y += drbd_main.o drbd_strings.o drbd_nl.o

drbd-y += drbd_interval.o

drbd-y += drbd_interval.o drbd_state.o



obj-$(CONFIG_BLK_DEV_DRBD)     += drbd.o

drivers/block/drbd/drbd_int.h

+6 −40
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ 
#include <net/tcp.h>

#include <linux/lru_cache.h>

#include <linux/prefetch.h>

#include <linux/drbd.h>

#include "drbd_state.h"



#ifdef __CHECKER__

# define __protected_by(x)       __attribute__((require_context(x,1,999,"rdwr")))
@@ -1120,35 +1122,12 @@ static inline void drbd_put_data_sock(struct drbd_conf *mdev) 


/* drbd_main.c */



enum chg_state_flags {

	CS_HARD	= 1,

	CS_VERBOSE = 2,

	CS_WAIT_COMPLETE = 4,

	CS_SERIALIZE    = 8,

	CS_ORDERED      = CS_WAIT_COMPLETE + CS_SERIALIZE,

};



enum dds_flags {

	DDSF_FORCED    = 1,

	DDSF_NO_RESYNC = 2, /* Do not run a resync for the new space */

};



extern void drbd_init_set_defaults(struct drbd_conf *mdev);

extern enum drbd_state_rv drbd_change_state(struct drbd_conf *mdev,

					    enum chg_state_flags f,

					    union drbd_state mask,

					    union drbd_state val);

extern void drbd_force_state(struct drbd_conf *, union drbd_state,

			union drbd_state);

extern enum drbd_state_rv _drbd_request_state(struct drbd_conf *,

					      union drbd_state,

					      union drbd_state,

					      enum chg_state_flags);

extern enum drbd_state_rv __drbd_set_state(struct drbd_conf *, union drbd_state,

					   enum chg_state_flags,

					   struct completion *done);

extern void print_st_err(struct drbd_conf *, union drbd_state,

			union drbd_state, int);

extern int  drbd_thread_start(struct drbd_thread *thi);

extern void _drbd_thread_stop(struct drbd_thread *thi, int restart, int wait);

#ifdef CONFIG_SMP
@@ -1712,6 +1691,10 @@ static inline int drbd_ee_has_active_page(struct drbd_peer_request *peer_req) 
}













static inline void drbd_state_lock(struct drbd_conf *mdev)

{

	wait_event(mdev->misc_wait,
@@ -1737,23 +1720,6 @@ _drbd_set_state(struct drbd_conf *mdev, union drbd_state ns, 
	return rv;

}



/**

 * drbd_request_state() - Reqest a state change

 * @mdev:	DRBD device.

 * @mask:	mask of state bits to change.

 * @val:	value of new state bits.

 *

 * This is the most graceful way of requesting a state change. It is verbose

 * quite verbose in case the state change is not possible, and all those

 * state changes are globally serialized.

 */

static inline int drbd_request_state(struct drbd_conf *mdev,

				     union drbd_state mask,

				     union drbd_state val)

{

	return _drbd_request_state(mdev, mask, val, CS_VERBOSE + CS_ORDERED);

}



#define __drbd_chk_io_error(m,f) __drbd_chk_io_error_(m,f, __func__)

static inline void __drbd_chk_io_error_(struct drbd_conf *mdev, int forcedetach, const char *where)

{

drivers/block/drbd/drbd_main.c

+1 −1178

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_state.c

0 → 100644
+1217 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_state.h

0 → 100644
+101 −0
Original line number Diff line number Diff line 
#ifndef DRBD_STATE_H

#define DRBD_STATE_H



struct drbd_conf;



/**

 * DOC: DRBD State macros

 *

 * These macros are used to express state changes in easily readable form.

 *

 * The NS macros expand to a mask and a value, that can be bit ored onto the

 * current state as soon as the spinlock (req_lock) was taken.

 *

 * The _NS macros are used for state functions that get called with the

 * spinlock. These macros expand directly to the new state value.

 *

 * Besides the basic forms NS() and _NS() additional _?NS[23] are defined

 * to express state changes that affect more than one aspect of the state.

 *

 * E.g. NS2(conn, C_CONNECTED, peer, R_SECONDARY)

 * Means that the network connection was established and that the peer

 * is in secondary role.

 */

#define role_MASK R_MASK

#define peer_MASK R_MASK

#define disk_MASK D_MASK

#define pdsk_MASK D_MASK

#define conn_MASK C_MASK

#define susp_MASK 1

#define user_isp_MASK 1

#define aftr_isp_MASK 1

#define susp_nod_MASK 1

#define susp_fen_MASK 1



#define NS(T, S) \

	({ union drbd_state mask; mask.i = 0; mask.T = T##_MASK; mask; }), \

	({ union drbd_state val; val.i = 0; val.T = (S); val; })

#define NS2(T1, S1, T2, S2) \

	({ union drbd_state mask; mask.i = 0; mask.T1 = T1##_MASK; \

	  mask.T2 = T2##_MASK; mask; }), \

	({ union drbd_state val; val.i = 0; val.T1 = (S1); \

	  val.T2 = (S2); val; })

#define NS3(T1, S1, T2, S2, T3, S3) \

	({ union drbd_state mask; mask.i = 0; mask.T1 = T1##_MASK; \

	  mask.T2 = T2##_MASK; mask.T3 = T3##_MASK; mask; }), \

	({ union drbd_state val;  val.i = 0; val.T1 = (S1); \

	  val.T2 = (S2); val.T3 = (S3); val; })



#define _NS(D, T, S) \

	D, ({ union drbd_state __ns; __ns.i = D->state.i; __ns.T = (S); __ns; })

#define _NS2(D, T1, S1, T2, S2) \

	D, ({ union drbd_state __ns; __ns.i = D->state.i; __ns.T1 = (S1); \

	__ns.T2 = (S2); __ns; })

#define _NS3(D, T1, S1, T2, S2, T3, S3) \

	D, ({ union drbd_state __ns; __ns.i = D->state.i; __ns.T1 = (S1); \

	__ns.T2 = (S2); __ns.T3 = (S3); __ns; })



enum chg_state_flags {

	CS_HARD	= 1,

	CS_VERBOSE = 2,

	CS_WAIT_COMPLETE = 4,

	CS_SERIALIZE    = 8,

	CS_ORDERED      = CS_WAIT_COMPLETE + CS_SERIALIZE,

};



extern enum drbd_state_rv drbd_change_state(struct drbd_conf *mdev,

					    enum chg_state_flags f,

					    union drbd_state mask,

					    union drbd_state val);

extern void drbd_force_state(struct drbd_conf *, union drbd_state,

			union drbd_state);

extern enum drbd_state_rv _drbd_request_state(struct drbd_conf *,

					      union drbd_state,

					      union drbd_state,

					      enum chg_state_flags);

extern enum drbd_state_rv __drbd_set_state(struct drbd_conf *, union drbd_state,

					   enum chg_state_flags,

					   struct completion *done);

extern void print_st_err(struct drbd_conf *, union drbd_state,

			union drbd_state, int);



extern void drbd_resume_al(struct drbd_conf *mdev);



/**

 * drbd_request_state() - Reqest a state change

 * @mdev:	DRBD device.

 * @mask:	mask of state bits to change.

 * @val:	value of new state bits.

 *

 * This is the most graceful way of requesting a state change. It is verbose

 * quite verbose in case the state change is not possible, and all those

 * state changes are globally serialized.

 */

static inline int drbd_request_state(struct drbd_conf *mdev,

				     union drbd_state mask,

				     union drbd_state val)

{

	return _drbd_request_state(mdev, mask, val, CS_VERBOSE + CS_ORDERED);

}



#endif