diff options
Diffstat (limited to 'fs/dlm')
-rw-r--r-- | fs/dlm/memory.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c index f858fef6e41c..fb9e2ee998ae 100644 --- a/fs/dlm/memory.c +++ b/fs/dlm/memory.c | |||
@@ -39,9 +39,7 @@ char *allocate_lvb(struct dlm_ls *ls) | |||
39 | { | 39 | { |
40 | char *p; | 40 | char *p; |
41 | 41 | ||
42 | p = kmalloc(ls->ls_lvblen, GFP_KERNEL); | 42 | p = kzalloc(ls->ls_lvblen, GFP_KERNEL); |
43 | if (p) | ||
44 | memset(p, 0, ls->ls_lvblen); | ||
45 | return p; | 43 | return p; |
46 | } | 44 | } |
47 | 45 | ||
@@ -59,9 +57,7 @@ struct dlm_rsb *allocate_rsb(struct dlm_ls *ls, int namelen) | |||
59 | 57 | ||
60 | DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,); | 58 | DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,); |
61 | 59 | ||
62 | r = kmalloc(sizeof(*r) + namelen, GFP_KERNEL); | 60 | r = kzalloc(sizeof(*r) + namelen, GFP_KERNEL); |
63 | if (r) | ||
64 | memset(r, 0, sizeof(*r) + namelen); | ||
65 | return r; | 61 | return r; |
66 | } | 62 | } |
67 | 63 | ||
@@ -101,9 +97,7 @@ struct dlm_direntry *allocate_direntry(struct dlm_ls *ls, int namelen) | |||
101 | DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN, | 97 | DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN, |
102 | printk("namelen = %d\n", namelen);); | 98 | printk("namelen = %d\n", namelen);); |
103 | 99 | ||
104 | de = kmalloc(sizeof(*de) + namelen, GFP_KERNEL); | 100 | de = kzalloc(sizeof(*de) + namelen, GFP_KERNEL); |
105 | if (de) | ||
106 | memset(de, 0, sizeof(*de) + namelen); | ||
107 | return de; | 101 | return de; |
108 | } | 102 | } |
109 | 103 | ||