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

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

drbd: Define the size of res_opts->cpu_mask in a single place 



Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent 6bbf53ca

drivers/block/drbd/drbd_main.c

+1 −2
Original line number Diff line number Diff line
@@ -2503,8 +2503,7 @@ int set_resource_options(struct drbd_resource *resource, struct res_opts *res_op 


	/* silently ignore cpu mask on UP kernel */

	if (nr_cpu_ids > 1 && res_opts->cpu_mask[0] != 0) {

		/* FIXME: Get rid of constant 32 here */

		err = bitmap_parse(res_opts->cpu_mask, 32,

		err = bitmap_parse(res_opts->cpu_mask, DRBD_CPU_MASK_SIZE,

				   cpumask_bits(new_cpu_mask), nr_cpu_ids);

		if (err) {

			drbd_warn(resource, "bitmap_parse() failed with %d\n", err);

include/linux/drbd.h

+2 −0
Original line number Diff line number Diff line
@@ -382,4 +382,6 @@ enum drbd_timeout_flag { 
#define DRBD_MD_INDEX_FLEX_EXT -2

#define DRBD_MD_INDEX_FLEX_INT -3



#define DRBD_CPU_MASK_SIZE 32



#endif

include/linux/drbd_genl.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf, 
)



GENL_struct(DRBD_NLA_RESOURCE_OPTS, 4, res_opts,

	__str_field_def(1,	DRBD_GENLA_F_MANDATORY,	cpu_mask,       32)

	__str_field_def(1,	DRBD_GENLA_F_MANDATORY,	cpu_mask,       DRBD_CPU_MASK_SIZE)

	__u32_field_def(2,	DRBD_GENLA_F_MANDATORY,	on_no_data, DRBD_ON_NO_DATA_DEF)

)