diff options
| author | Philipp Reisner | 2012-04-30 12:53:52 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:58:29 +0100 |
| commit | c5b005ab7091c9ef4ca9b47569a8e27e54588933 (patch) | |
| tree | 12cf37f22adc30396c75b8373d2ac10e103e6698 /drivers/block/drbd/drbd_main.c | |
| parent | drbd: grammar fix in log message (diff) | |
| download | kernel-qcow2-linux-c5b005ab7091c9ef4ca9b47569a8e27e54588933.tar.gz kernel-qcow2-linux-c5b005ab7091c9ef4ca9b47569a8e27e54588933.tar.xz kernel-qcow2-linux-c5b005ab7091c9ef4ca9b47569a8e27e54588933.zip | |
drbd: use bitmap_parse instead of __bitmap_parse
The buffer 'sc.cpu_mask' is a kernel buffer. If bitmap_parse is used
instead of __bitmap_parse the extra parameter that indicates a kernel
buffer is not needed.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Lars Ellenberg <drbd-dev@lists.linbit.com>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index f8438d426d06..9e65bad3e51b 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/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; } |