Commit 8d07fd50 authored Dec 13, 2006 by David Teigland Committed by Steven Whitehouse Feb 05, 2007

[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>

parent da49f36f

fs/dlm/lock.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -2430,8 +2430,12 @@ static int receive_request_args(struct dlm_ls ls, struct dlm_lkb lkb,

		DLM_ASSERT(is_master_copy(lkb), dlm_print_lkb(lkb););

		if (receive_lvb(ls, lkb, ms))
		if (lkb->lkb_exflags & DLM_LKF_VALBLK) {
		/* lkb was just created so there won't be an lvb yet */
		lkb->lkb_lvbptr = allocate_lvb(ls);
		if (!lkb->lkb_lvbptr)
		return -ENOMEM;
		}

		return 0;
		}

Admin message