evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

deleg: make use of delegation stateids

Browse source 
combined nfs41_lock_stateid_arg() into nfs41_open_stateid_arg().  if a delegation is present, use the delegation stateid before looking at lock/open stateids.  if a delegation recall is in progress, wait on its condition variable before falling back to the open stateid

made nfs41_lock_stateid_arg() static to lock.c because of its special semantics; open_to_lock_owner4 for LOCK won't accept a delegation stateid, so nfs41_delegation_to_open() is called to convert it

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2011-07-07 13:48:48 -04:00 • committed by unknown
parent 02216cbf28
commit ee71a62af2
7 changed files with 75 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/acl.c
View file

@ -785,7 +785,7 @@ static int handle_setacl(nfs41_upcall *upcall)
}
}
nfs41_lock_stateid_arg(state, &stateid);
nfs41_open_stateid_arg(state, &stateid);
status = nfs41_setattr(state->session, &state->file, &stateid, &info);
if (status) {
dprintf(1, "handle_setacl: nfs41_setattr() failed with error %s.\n",