diff options
| author | David Teigland <teigland@redhat.com> | 2007-01-31 13:25:00 -0600 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-02-05 13:38:24 -0500 |
| commit | 62a0f62369b0fece37f6652d69b918c89d53c3b3 (patch) | |
| tree | 1b32f039b103dbb34af458ec593728682913505f /fs | |
| parent | 9beeb9f3c5b0401491f59b71521ab2678f584b09 (diff) | |
| download | kernel_samsung_smdk4412-62a0f62369b0fece37f6652d69b918c89d53c3b3.zip kernel_samsung_smdk4412-62a0f62369b0fece37f6652d69b918c89d53c3b3.tar.gz kernel_samsung_smdk4412-62a0f62369b0fece37f6652d69b918c89d53c3b3.tar.bz2 | |
[DLM] zero new user lvbs
A new lvb for a userland lock wasn't being initialized to zero.
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index c10257f..e725005 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -3643,7 +3643,7 @@ int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua, } if (flags & DLM_LKF_VALBLK) { - ua->lksb.sb_lvbptr = kmalloc(DLM_USER_LVB_LEN, GFP_KERNEL); + ua->lksb.sb_lvbptr = kzalloc(DLM_USER_LVB_LEN, GFP_KERNEL); if (!ua->lksb.sb_lvbptr) { kfree(ua); __put_lkb(ls, lkb); @@ -3712,7 +3712,7 @@ int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, ua = (struct dlm_user_args *)lkb->lkb_astparam; if (flags & DLM_LKF_VALBLK && !ua->lksb.sb_lvbptr) { - ua->lksb.sb_lvbptr = kmalloc(DLM_USER_LVB_LEN, GFP_KERNEL); + ua->lksb.sb_lvbptr = kzalloc(DLM_USER_LVB_LEN, GFP_KERNEL); if (!ua->lksb.sb_lvbptr) { error = -ENOMEM; goto out_put; |