drbd: Convert vmalloc/memset to vzalloc
authorJoe Perches <joe@perches.com>
Sat, 28 May 2011 17:36:24 +0000 (10:36 -0700)
committerJiri Kosina <jkosina@suse.cz>
Thu, 15 Sep 2011 11:55:02 +0000 (13:55 +0200)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/block/drbd/drbd_bitmap.c

index 7b976296b564faeed6a676afb22119bb99500174..912f585a760fd92dbbe45f42cd8af4658af80c53 100644 (file)
@@ -378,15 +378,14 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
         * thread.  As we have no disk yet, we are not in the IO path,
         * not even the IO path of the peer. */
        bytes = sizeof(struct page *)*want;
-       new_pages = kmalloc(bytes, GFP_KERNEL);
+       new_pages = kzalloc(bytes, GFP_KERNEL);
        if (!new_pages) {
-               new_pages = vmalloc(bytes);
+               new_pages = vzalloc(bytes);
                if (!new_pages)
                        return NULL;
                vmalloced = 1;
        }
 
-       memset(new_pages, 0, bytes);
        if (want >= have) {
                for (i = 0; i < have; i++)
                        new_pages[i] = old_pages[i];