src/resource.c

[David Teigland]

src/resource.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 8910c06e7cc1afa676b311a0208468ddd98a0450
Author: David Teigland 
Date:   Fri Jun 29 10:23:31 2012 -0500

daemon: fix inquire lver

The lver returned by inquire was always 0 because it
    was not being copied back to the token after acquire.

Signed-off-by: David Teigland

diff --git a/src/resource.c b/src/resource.c
index cef0765..1ef03b2 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -654,6 +654,10 @@ int acquire_token(struct task *task, struct token *token)

memcpy(&r->leader, &leader, sizeof(struct leader_record));

+	/* copy lver into token because inquire looks there for it */
+	if (!(token->acquire_flags & SANLK_RES_SHARED))
+		token->r.lver = leader.lver;
+
    if (token->acquire_flags & SANLK_RES_SHARED) {
    	rv = set_mode_block(task, token, token->host_id,
    			    token->host_generation, MBLOCK_SHARED);