mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +00:00
NFSv4: Always do open_to_lock_owner if the lock stateid is uninitialised
The original text in RFC3530 was terribly confusing since it conflated lockowners and lock stateids. RFC3530bis clarifies that you must use open_to_lock_owner when there is no lock state for that file+lockowner combination. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
39071e6fff
commit
6b447539aa
@ -5611,7 +5611,7 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata)
|
||||
if (nfs_wait_on_sequence(data->arg.lock_seqid, task) != 0)
|
||||
goto out_wait;
|
||||
/* Do we need to do an open_to_lock_owner? */
|
||||
if (!(data->arg.lock_seqid->sequence->flags & NFS_SEQID_CONFIRMED)) {
|
||||
if (!test_bit(NFS_LOCK_INITIALIZED, &data->lsp->ls_flags)) {
|
||||
if (nfs_wait_on_sequence(data->arg.open_seqid, task) != 0) {
|
||||
goto out_release_lock_seqid;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user