NFSv4.x: Drop the slot if nfs4_delegreturn_prepare waits for layoutreturn
authorTrond Myklebust <trond.myklebust@hammerspace.com>
Wed, 13 Nov 2019 08:39:36 +0000 (09:39 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Jan 2020 18:47:05 +0000 (19:47 +0100)
commitda84bc4ff519197eae1b50ace0b3354561ceb624
treebaf704d5adbf73631bead5b5f612049ac43754f8
parent04b173066116b523c8bc5957e4e105865b3f7a33
NFSv4.x: Drop the slot if nfs4_delegreturn_prepare waits for layoutreturn

commit 5326de9e94bedcf7366e7e7625d4deb8c1f1ca8a upstream.

If nfs4_delegreturn_prepare needs to wait for a layoutreturn to complete
then make sure we drop the sequence slot if we hold it.

Fixes: 1c5bd76d17cc ("pNFS: Enable layoutreturn operation for return-on-close")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/nfs4proc.c