aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-12-13 11:39:20 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2007-02-05 13:35:59 -0500
commit8d07fd509e9c82a59e37b8b18a2fd0e8ef8fc837 (patch)
tree165b88e0208e00301a5069507e84df597d636de8 /fs
parentda49f36f4f64feb281d7663be99e779b2aecc607 (diff)
[DLM] fix receive_request() lvb copying
LVB's are not sent as part of new requests, but the code receiving the request was copying data into the lvb anyway. The space in the message where it mistakenly thought the lvb lived actually contained the resource name, so it wound up incorrectly copying this name data into the lvb. Fix is to just create the lvb, not copy junk into it. 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.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index cdf2cb9297fd..d8e919bad41a 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -2430,8 +2430,12 @@ static int receive_request_args(struct dlm_ls *ls, struct dlm_lkb *lkb,
2430 2430
2431 DLM_ASSERT(is_master_copy(lkb), dlm_print_lkb(lkb);); 2431 DLM_ASSERT(is_master_copy(lkb), dlm_print_lkb(lkb););
2432 2432
2433 if (receive_lvb(ls, lkb, ms)) 2433 if (lkb->lkb_exflags & DLM_LKF_VALBLK) {
2434 return -ENOMEM; 2434 /* lkb was just created so there won't be an lvb yet */
2435 lkb->lkb_lvbptr = allocate_lvb(ls);
2436 if (!lkb->lkb_lvbptr)
2437 return -ENOMEM;
2438 }
2435 2439
2436 return 0; 2440 return 0;
2437} 2441}