Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / fs / reiserfs / resize.c

diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c
index b6b9b1f..7483279 100644 (file)
--- a/fs/reiserfs/resize.c
+++ b/fs/reiserfs/resize.c
@@ -111,15 +111,13 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
                /* allocate additional bitmap blocks, reallocate array of bitmap
                 * block pointers */
                bitmap =
-                   vmalloc(sizeof(struct reiserfs_bitmap_info) * bmap_nr_new);
+                   vzalloc(sizeof(struct reiserfs_bitmap_info) * bmap_nr_new);
                if (!bitmap) {
                        /* Journal bitmaps are still supersized, but the memory isn't
                         * leaked, so I guess it's ok */
                        printk("reiserfs_resize: unable to allocate memory.\n");
                        return -ENOMEM;
                }
-               memset(bitmap, 0,
-                      sizeof(struct reiserfs_bitmap_info) * bmap_nr_new);
                for (i = 0; i < bmap_nr; i++)
                        bitmap[i] = old_bitmap[i];