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

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

drbd: Also define the default values of boolean flags in a single place 



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

include/linux/drbd_genl.h

+8 −8
Original line number Diff line number Diff line
@@ -122,10 +122,10 @@ GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf, 
	__u32_field_def(14,	GENLA_F_MANDATORY,	c_max_rate, DRBD_C_MAX_RATE_DEF)

	__u32_field_def(15,	GENLA_F_MANDATORY,	c_min_rate, DRBD_C_MIN_RATE_DEF)



	__flg_field_def(16, GENLA_F_MANDATORY,	disk_barrier, 1)

	__flg_field_def(17, GENLA_F_MANDATORY,	disk_flushes, 1)

	__flg_field_def(18, GENLA_F_MANDATORY,	disk_drain, 1)

	__flg_field_def(19, GENLA_F_MANDATORY,	md_flushes, 1)

	__flg_field_def(16, GENLA_F_MANDATORY,	disk_barrier, DRBD_DISK_BARRIER_DEF)

	__flg_field_def(17, GENLA_F_MANDATORY,	disk_flushes, DRBD_DISK_FLUSHES_DEF)

	__flg_field_def(18, GENLA_F_MANDATORY,	disk_drain, DRBD_DISK_DRAIN_DEF)

	__flg_field_def(19, GENLA_F_MANDATORY,	md_flushes, DRBD_MD_FLUSHES_DEF)

)



GENL_struct(DRBD_NLA_RESOURCE_OPTS, 4, res_opts,
@@ -160,12 +160,12 @@ GENL_struct(DRBD_NLA_NET_CONF, 5, net_conf, 
	__u32_field_def(23,	GENLA_F_MANDATORY,	on_congestion, DRBD_ON_CONGESTION_DEF)

	__u32_field_def(24,	GENLA_F_MANDATORY,	cong_fill, DRBD_CONG_FILL_DEF)

	__u32_field_def(25,	GENLA_F_MANDATORY,	cong_extents, DRBD_CONG_EXTENTS_DEF)

	__flg_field_def(26, GENLA_F_MANDATORY,	two_primaries, 0)

	__flg_field_def(26, GENLA_F_MANDATORY,	two_primaries, DRBD_ALLOW_TWO_PRIMARIES_DEF)

	__flg_field(27, GENLA_F_MANDATORY | GENLA_F_INVARIANT,	want_lose)

	__flg_field_def(28, GENLA_F_MANDATORY,	tcp_cork, 1)

	__flg_field_def(29, GENLA_F_MANDATORY,	always_asbp, 0)

	__flg_field_def(28, GENLA_F_MANDATORY,	tcp_cork, DRBD_TCP_CORK_DEF)

	__flg_field_def(29, GENLA_F_MANDATORY,	always_asbp, DRBD_ALWAYS_ASBP_DEF)

	__flg_field(30, GENLA_F_MANDATORY | GENLA_F_INVARIANT,	dry_run)

	__flg_field_def(31,	GENLA_F_MANDATORY,	use_rle, 0)

	__flg_field_def(31,	GENLA_F_MANDATORY,	use_rle, DRBD_USE_RLE_DEF)

)



GENL_struct(DRBD_NLA_SET_ROLE_PARMS, 6, set_role_parms,

include/linux/drbd_limits.h

+10 −0
Original line number Diff line number Diff line
@@ -170,4 +170,14 @@ 


#define DRBD_PROTOCOL_DEF DRBD_PROT_C



#define DRBD_DISK_BARRIER_DEF	0

#define DRBD_DISK_FLUSHES_DEF	1

#define DRBD_DISK_DRAIN_DEF	1

#define DRBD_MD_FLUSHES_DEF	1

#define DRBD_TCP_CORK_DEF	1



#define DRBD_ALLOW_TWO_PRIMARIES_DEF	0

#define DRBD_ALWAYS_ASBP_DEF	0

#define DRBD_USE_RLE_DEF	0



#endif