pNFS: Stricter ordering of layoutget and layoutreturn

stable inclusion
from stable-5.10.9
commit 06f58dbc49a23c99e5c0f246879ed16667f7bf8f
bugzilla: 47457

--------------------------------

commit 2c8d5fc3 upstream.

If a layout return is in progress, we should wait for it to complete,
in case the layout segment we are picking up gets returned too.

Fixes: 30cb3ee2 ("pNFS: Handle NFS4ERR_OLD_STATEID on layoutreturn by bumping the state seqid")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Chen Jun <chenjun102@huawei.com>
Acked-by: Xie XiuQi <xiexiuqi@huawei.com>