From 1a062e0aa68b94e0a8eae34068dcaa8239110e2f Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 26 Jun 2013 14:27:57 +0200 Subject: [PATCH] --- yaml --- r: 377721 b: refs/heads/master c: cfa805f6f19639b37ee877085770a396b70f2da1 h: refs/heads/master i: 377719: b7b6710100dbdc235b2eac6e357a54e3e0454feb v: v3 --- [refs] | 2 +- trunk/fs/dlm/lock.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 23f430030025..4ab1103816a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 696b3d84605e5546cbddefdc95b9099f908fd56e +refs/heads/master: cfa805f6f19639b37ee877085770a396b70f2da1 diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c index 1b1146670c4b..e223a911a834 100644 --- a/trunk/fs/dlm/lock.c +++ b/trunk/fs/dlm/lock.c @@ -2038,8 +2038,8 @@ static void set_lvb_lock_pc(struct dlm_rsb *r, struct dlm_lkb *lkb, b = dlm_lvb_operations[lkb->lkb_grmode + 1][lkb->lkb_rqmode + 1]; if (b == 1) { int len = receive_extralen(ms); - if (len > DLM_RESNAME_MAXLEN) - len = DLM_RESNAME_MAXLEN; + if (len > r->res_ls->ls_lvblen) + len = r->res_ls->ls_lvblen; memcpy(lkb->lkb_lvbptr, ms->m_extra, len); lkb->lkb_lvbseq = ms->m_lvbseq; } @@ -3893,8 +3893,8 @@ static int receive_lvb(struct dlm_ls *ls, struct dlm_lkb *lkb, if (!lkb->lkb_lvbptr) return -ENOMEM; len = receive_extralen(ms); - if (len > DLM_RESNAME_MAXLEN) - len = DLM_RESNAME_MAXLEN; + if (len > ls->ls_lvblen) + len = ls->ls_lvblen; memcpy(lkb->lkb_lvbptr, ms->m_extra, len); } return 0;