]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drbd: use bitmap_parse instead of __bitmap_parse
authorPhilipp Reisner <philipp.reisner@linbit.com>
Mon, 30 Apr 2012 10:53:52 +0000 (12:53 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:58:29 +0000 (16:58 +0100)
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>
drivers/block/drbd/drbd_main.c

index f8438d426d067ddd6966f9d0af3d9335885ff621..9e65bad3e51be437982942ea9a92d29d695009a7 100644 (file)
@@ -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;
                }