Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Joe Perches and committed by
Jiri Kosina
558feb08 1ac4594d

+7 -18
+2 -3
fs/coda/coda_linux.h
··· 59 59 60 60 #define CODA_ALLOC(ptr, cast, size) do { \ 61 61 if (size < PAGE_SIZE) \ 62 - ptr = kmalloc((unsigned long) size, GFP_KERNEL); \ 62 + ptr = kzalloc((unsigned long) size, GFP_KERNEL); \ 63 63 else \ 64 - ptr = (cast)vmalloc((unsigned long) size); \ 64 + ptr = (cast)vzalloc((unsigned long) size); \ 65 65 if (!ptr) \ 66 66 printk("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \ 67 - else memset( ptr, 0, size ); \ 68 67 } while (0) 69 68 70 69
+3 -6
fs/reiserfs/journal.c
··· 291 291 for (i = 0; i < JOURNAL_NUM_BITMAPS; i++) { 292 292 jb = jb_array + i; 293 293 jb->journal_list = NULL; 294 - jb->bitmaps = vmalloc(mem); 294 + jb->bitmaps = vzalloc(mem); 295 295 if (!jb->bitmaps) { 296 296 reiserfs_warning(sb, "clm-2000", "unable to " 297 297 "allocate bitmaps for journal lists"); 298 298 failed = 1; 299 299 break; 300 300 } 301 - memset(jb->bitmaps, 0, mem); 302 301 } 303 302 if (failed) { 304 303 free_list_bitmaps(sb, jb_array); ··· 352 353 if (num_cnodes <= 0) { 353 354 return NULL; 354 355 } 355 - head = vmalloc(num_cnodes * sizeof(struct reiserfs_journal_cnode)); 356 + head = vzalloc(num_cnodes * sizeof(struct reiserfs_journal_cnode)); 356 357 if (!head) { 357 358 return NULL; 358 359 } 359 - memset(head, 0, num_cnodes * sizeof(struct reiserfs_journal_cnode)); 360 360 head[0].prev = NULL; 361 361 head[0].next = head + 1; 362 362 for (i = 1; i < num_cnodes; i++) { ··· 2683 2685 * dependency inversion warnings. 2684 2686 */ 2685 2687 reiserfs_write_unlock(sb); 2686 - journal = SB_JOURNAL(sb) = vmalloc(sizeof(struct reiserfs_journal)); 2688 + journal = SB_JOURNAL(sb) = vzalloc(sizeof(struct reiserfs_journal)); 2687 2689 if (!journal) { 2688 2690 reiserfs_warning(sb, "journal-1256", 2689 2691 "unable to get memory for journal structure"); 2690 2692 reiserfs_write_lock(sb); 2691 2693 return 1; 2692 2694 } 2693 - memset(journal, 0, sizeof(struct reiserfs_journal)); 2694 2695 INIT_LIST_HEAD(&journal->j_bitmap_nodes); 2695 2696 INIT_LIST_HEAD(&journal->j_prealloc_list); 2696 2697 INIT_LIST_HEAD(&journal->j_working_list);
+1 -3
fs/reiserfs/resize.c
··· 111 111 /* allocate additional bitmap blocks, reallocate array of bitmap 112 112 * block pointers */ 113 113 bitmap = 114 - vmalloc(sizeof(struct reiserfs_bitmap_info) * bmap_nr_new); 114 + vzalloc(sizeof(struct reiserfs_bitmap_info) * bmap_nr_new); 115 115 if (!bitmap) { 116 116 /* Journal bitmaps are still supersized, but the memory isn't 117 117 * leaked, so I guess it's ok */ 118 118 printk("reiserfs_resize: unable to allocate memory.\n"); 119 119 return -ENOMEM; 120 120 } 121 - memset(bitmap, 0, 122 - sizeof(struct reiserfs_bitmap_info) * bmap_nr_new); 123 121 for (i = 0; i < bmap_nr; i++) 124 122 bitmap[i] = old_bitmap[i]; 125 123
+1 -6
fs/xfs/linux-2.6/kmem.h
··· 61 61 62 62 static inline void *kmem_zalloc_large(size_t size) 63 63 { 64 - void *ptr; 65 - 66 - ptr = vmalloc(size); 67 - if (ptr) 68 - memset(ptr, 0, size); 69 - return ptr; 64 + return vzalloc(size); 70 65 } 71 66 static inline void kmem_free_large(void *ptr) 72 67 {