Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: [PATCH] nfsv4.0/release-lockowner: Check for proper LOCKS_HELD
 response
From:   Chuck Lever <chuck.lever@oracle.com>
To:     bfields@fieldses.org
Cc:     linux-nfs@vger.kernel.org
Date:   Sun, 29 May 2022 13:07:31 -0400
Message-ID: <165384405174.3290283.7508180988614656582.stgit@morisot.1015granger.net>
User-Agent: StGit/1.5
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk

Ensure that RELEASE_LOCKOWNER returns LOCKS_HELD if the lockowner
is still in use.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 nfs4.0/servertests/st_releaselockowner.py |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/nfs4.0/servertests/st_releaselockowner.py b/nfs4.0/servertests/st_releaselockowner.py
index 2c83f99b207f..b296e6c2752a 100644
--- a/nfs4.0/servertests/st_releaselockowner.py
+++ b/nfs4.0/servertests/st_releaselockowner.py
@@ -49,3 +49,24 @@ def testFile2(t, env):
     owner = lock_owner4(c.clientid, b"lockowner_RLOWN2")
     res = c.compound([op.release_lockowner(owner)])
     check(res)
+
+def testLocksHeld(t, env):
+    """RELEASE_LOCKOWNER - Locks held test
+
+    FLAGS: releaselockowner all
+    DEPEND:
+    CODE: RLOWN3
+    """
+    c = env.c1
+    c.init_connection()
+    fh, stateid = c.create_confirm(t.word())
+    res = c.lock_file(t.word(), fh, stateid, lockowner=b"lockowner_RLOWN3")
+    check(res)
+    owner = lock_owner4(c.clientid, b"lockowner_RLOWN3")
+    res2 = c.compound([op.release_lockowner(owner)])
+    check(res2, NFS4ERR_LOCKS_HELD)
+    res = c.unlock_file(1, fh, res.lockid)
+    check(res)
+    owner = lock_owner4(c.clientid, b"lockowner_RLOWN3")
+    res = c.compound([op.release_lockowner(owner)])
+    check(res)