zhoury14@mails.tsinghua.edu.cn has uploaded this change for review.

View Change

In function state_lock, when blow three situation happen together:
1)the parameter blocking = NLM_STATE_LOCKING
2)and can find a conflict lock entry in obj->state_hdl->file.lock_list, in that case copy_conflict will be called
3)and FSAL support async blocking locks
The return value of do_lock_op and state_lock will be STATE_LOCK_BLOCKED. And in function nlm4_Lock:177, the nlm_process_conflict may not be called, which there will lost a call of dec_state_owner_re

Change-Id: I12b4f6bb944c1af913c1ac7246bc02647129d812
Signed-off-by: zhoury14 <zhoury14@mails.tsinghua.edu.cn>
---
M src/Protocols/NLM/nlm_Lock.c
M src/SAL/state_lock.c
2 files changed, 7 insertions(+), 1 deletion(-)

git pull ssh://review.gerrithub.io:29418/ffilz/nfs-ganesha refs/changes/70/419770/1

To view, visit change 419770. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: ffilz/nfs-ganesha
Gerrit-Branch: next
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12b4f6bb944c1af913c1ac7246bc02647129d812
Gerrit-Change-Number: 419770
Gerrit-PatchSet: 1
Gerrit-Owner: zhoury14@mails.tsinghua.edu.cn