fs: Convert vmalloc/memset to vzalloc

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Alex Elder <aelder@sgi.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/fs/coda/coda_linux.h b/fs/coda/coda_linux.h
index 44e17e9c21ae0a16e3c27b6a17e7e5be4bcab4f7..cc0ea9fe5ecf9af0ee79bfcd1b2ecdfdc4ac81da 100644 (file)
--- a/fs/coda/coda_linux.h
+++ b/fs/coda/coda_linux.h
@@ -59,12 +59,11 @@ void coda_sysctl_clean(void);
 
 #define CODA_ALLOC(ptr, cast, size) do { \
     if (size < PAGE_SIZE) \
-        ptr = kmalloc((unsigned long) size, GFP_KERNEL); \
+        ptr = kzalloc((unsigned long) size, GFP_KERNEL); \
     else \
-        ptr = (cast)vmalloc((unsigned long) size); \
+        ptr = (cast)vzalloc((unsigned long) size); \
     if (!ptr) \
         printk("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \
-    else memset( ptr, 0, size ); \
 } while (0)
 
 

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index a159ba5a35e722457f83977bf4a82c1344528fc8..eb711060a6f2b771d4b4e68613ea4890273633dd 100644 (file)
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -291,14 +291,13 @@ int reiserfs_allocate_list_bitmaps(struct super_block *sb,
        for (i = 0; i < JOURNAL_NUM_BITMAPS; i++) {
                jb = jb_array + i;
                jb->journal_list = NULL;
-               jb->bitmaps = vmalloc(mem);
+               jb->bitmaps = vzalloc(mem);
                if (!jb->bitmaps) {
                        reiserfs_warning(sb, "clm-2000", "unable to "
                                         "allocate bitmaps for journal lists");
                        failed = 1;
                        break;
                }
-               memset(jb->bitmaps, 0, mem);
        }
        if (failed) {
                free_list_bitmaps(sb, jb_array);
@@ -353,11 +352,10 @@ static struct reiserfs_journal_cnode *allocate_cnodes(int num_cnodes)
        if (num_cnodes <= 0) {
                return NULL;
        }
-       head = vmalloc(num_cnodes * sizeof(struct reiserfs_journal_cnode));
+       head = vzalloc(num_cnodes * sizeof(struct reiserfs_journal_cnode));
        if (!head) {
                return NULL;
        }
-       memset(head, 0, num_cnodes * sizeof(struct reiserfs_journal_cnode));
        head[0].prev = NULL;
        head[0].next = head + 1;
        for (i = 1; i < num_cnodes; i++) {
@@ -2685,14 +2683,13 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
         * dependency inversion warnings.
         */
        reiserfs_write_unlock(sb);
-       journal = SB_JOURNAL(sb) = vmalloc(sizeof(struct reiserfs_journal));
+       journal = SB_JOURNAL(sb) = vzalloc(sizeof(struct reiserfs_journal));
        if (!journal) {
                reiserfs_warning(sb, "journal-1256",
                                 "unable to get memory for journal structure");
                reiserfs_write_lock(sb);
                return 1;
        }
-       memset(journal, 0, sizeof(struct reiserfs_journal));
        INIT_LIST_HEAD(&journal->j_bitmap_nodes);
        INIT_LIST_HEAD(&journal->j_prealloc_list);
        INIT_LIST_HEAD(&journal->j_working_list);

diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c
index b6b9b1fe33b057c864ca146af150565c11de585c..7483279b482d351f44073e86e9abf57f66e3731b 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];
 

diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h
index f7c8f7a9ea6d5dab0e86ae3b60daf90931ec5f86..292eff1980309a7c31ea1081650cc170a2c72a0d 100644 (file)
--- a/fs/xfs/linux-2.6/kmem.h
+++ b/fs/xfs/linux-2.6/kmem.h
@@ -61,12 +61,7 @@ extern void  kmem_free(const void *);
 
 static inline void *kmem_zalloc_large(size_t size)
 {
-       void *ptr;
-
-       ptr = vmalloc(size);
-       if (ptr)
-               memset(ptr, 0, size);
-       return ptr;
+       return vzalloc(size);
 }
 static inline void kmem_free_large(void *ptr)
 {