deleg: make use of delegation stateids
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:
parent
02216cbf28
commit
ee71a62af2
7 changed files with 75 additions and 26 deletions
|
|
@ -719,7 +719,7 @@ enum pnfs_status pnfs_layout_state_open(
|
|||
goto out;
|
||||
}
|
||||
|
||||
nfs41_lock_stateid_arg(state, &stateid);
|
||||
nfs41_open_stateid_arg(state, &stateid);
|
||||
|
||||
/* make sure the layout can satisfy this request */
|
||||
status = file_layout_get(layout, session, &state->file,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue