public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Scott Mayhew <smayhew@redhat.com>
To: calum.mackay@oracle.com
Cc: linux-nfs@vger.kernel.org, Jeff Layton <jlayton@kernel.org>
Subject: [PATCH 3/5] pynfs: remove erroneous test from DELEG24 and DELEG25
Date: Fri,  3 Apr 2026 09:27:36 -0400	[thread overview]
Message-ID: <20260403132738.1482011-4-smayhew@redhat.com> (raw)
In-Reply-To: <20260403132738.1482011-1-smayhew@redhat.com>

fattr4_time_deleg_modify is valid in CB_GETATTR and SETATTR.  attrs2
contains the attributes from a GETATTR reply, and will never contain the
fattr4_time_deleg_modify attribute.

Cc: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
Jeff - not sure what you want to do here.  We can compare the the
FATTR4_TIME_DELEG_MODIFY that we sent to the server with the
FATTR4_TIME_MODIFY in attrs1 and/or attrs2, we just need to return
it (or the whole cbattrs dictionary) from _testCbGetattr().

 nfs4.1/server41tests/st_delegation.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nfs4.1/server41tests/st_delegation.py b/nfs4.1/server41tests/st_delegation.py
index 934e558..6ed1f5d 100644
--- a/nfs4.1/server41tests/st_delegation.py
+++ b/nfs4.1/server41tests/st_delegation.py
@@ -400,9 +400,6 @@ def testCbGetattrNoChange(t, env):
         fail("Bad size: %u != %u" % (attrs1[FATTR4_SIZE], attrs2[FATTR4_SIZE]))
     if attrs1[FATTR4_CHANGE] != attrs2[FATTR4_CHANGE]:
         fail("Bad change attribute: %u != %u" % (attrs1[FATTR4_CHANGE], attrs2[FATTR4_CHANGE]))
-    if FATTR4_TIME_DELEG_MODIFY in attrs2:
-        if attrs1[FATTR4_TIME_MODIFY] != attrs2[FATTR4_TIME_DELEG_MODIFY]:
-            fail("Bad modify time: ", attrs1[FATTR4_TIME_MODIFY], " != ", attrs2[FATTR4_TIME_DELEG_MODIFY])
 
 def testCbGetattrWithChange(t, env):
     """Test CB_GETATTR with simulated changes to file
@@ -419,9 +416,6 @@ def testCbGetattrWithChange(t, env):
         fail("Bad size: %u != 5" % attrs2[FATTR4_SIZE])
     if attrs1[FATTR4_CHANGE] == attrs2[FATTR4_CHANGE]:
         fail("Bad change attribute: %u == %u" % (attrs1[FATTR4_CHANGE], attrs2[FATTR4_CHANGE]))
-    if FATTR4_TIME_DELEG_MODIFY in attrs2:
-        if attrs1[FATTR4_TIME_MODIFY] == attrs2[FATTR4_TIME_DELEG_MODIFY]:
-            fail("Bad modify time: ", attrs1[FATTR4_TIME_MODIFY], " == ", attrs2[FATTR4_TIME_DELEG_MODIFY])
 
 def testDelegReadAfterClose(t, env):
     """Test read with delegation stateid after close
-- 
2.53.0


  parent reply	other threads:[~2026-04-03 13:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-03 13:27 [PATCH 0/5] pynfs: a handful of fixes and a new CB_GETATTR test Scott Mayhew
2026-04-03 13:27 ` [PATCH 1/5] pynfs: ensure tests clean up after themselves Scott Mayhew
2026-04-03 13:27 ` [PATCH 2/5] pynfs: fix the check for delegated attribute support Scott Mayhew
2026-04-03 13:27 ` Scott Mayhew [this message]
2026-04-03 14:07   ` [PATCH 3/5] pynfs: remove erroneous test from DELEG24 and DELEG25 Jeff Layton
2026-04-03 13:27 ` [PATCH 4/5] pynfs: _testCbGetattr() should check the delegation that was received Scott Mayhew
2026-04-03 13:27 ` [PATCH 5/5] pynfs: add delegation test for CB_GETATTR after sync WRITE Scott Mayhew

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260403132738.1482011-4-smayhew@redhat.com \
    --to=smayhew@redhat.com \
    --cc=calum.mackay@oracle.com \
    --cc=jlayton@kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox