From 84d768cb4ee2060c27b002155f20b66f8200a8bd Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 30 Apr 2012 12:53:52 +0200 Subject: [PATCH] --- yaml --- r: 346195 b: refs/heads/master c: c5b005ab7091c9ef4ca9b47569a8e27e54588933 h: refs/heads/master i: 346193: 84686b45dd1583d50477bcc52300b056089b9321 346191: b0f57b0c201c73746d15ee0651b4a78c67c350e7 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 68bf8dd8b1b1..f12a9ba65406 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1882e22df7850b7ff74395aa955066f5405020d6 +refs/heads/master: c5b005ab7091c9ef4ca9b47569a8e27e54588933 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index f8438d426d06..9e65bad3e51b 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -2637,10 +2637,10 @@ int set_resource_options(struct drbd_tconn *tconn, struct res_opts *res_opts) /* 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, 0, - cpumask_bits(new_cpu_mask), nr_cpu_ids); + err = bitmap_parse(res_opts->cpu_mask, 32, + cpumask_bits(new_cpu_mask), nr_cpu_ids); if (err) { - conn_warn(tconn, "__bitmap_parse() failed with %d\n", err); + conn_warn(tconn, "bitmap_parse() failed with %d\n", err); /* retcode = ERR_CPU_MASK_PARSE; */ goto fail; }