Skip to contentSkip to conversation

NFS: fix RENAME attr in presence of directory delegations

PATCH In review Olga Kornievskaia 2 participants 2 messages Apr 2 – Apr 9

Subsystems (2)
lore
Share & tools
lore

Olga Kornievskaia

author reviewer
#0 lore raw

PATCH 1/1 NFS: fix RENAME attr in presence of directory delegations

Since commit 6f9bda2337f8 ("NFS: Fix directory delegation verifier checks") xfstest generic/309 is failing because after the rename (mv) operation, client's mtime/ctime is the same. Update the delegated mtime when directory delegations are present in rename.

Fixes 6f9bda2337f8 ("NFS: Fix directory delegation verifier checks")
---
 fs/nfs/inode.c    | 3 ++-
 fs/nfs/nfs4proc.c | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
fs/nfs/inode.c +2 -1
index 3a5bba7e3c92..43a0543364b8 100644
@@ -692,7 +692,8 @@ void nfs_update_delegated_atime(struct inode *inode)
 
 void nfs_update_delegated_mtime_locked(struct inode *inode)
 {
-	if (nfs_have_delegated_mtime(inode))
+	if (nfs_have_delegated_mtime(inode) ||
+	    nfs_have_directory_delegation(inode))
 		nfs_update_mtime(inode);
 }
 
fs/nfs/nfs4proc.c +1 -0
index 768de9935ff1..dd800403a7ce 100644
@@ -5052,6 +5052,7 @@ static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
 					res->new_fattr->time_start,
 					NFS_INO_INVALID_NLINK |
 					    NFS_INO_INVALID_DATA);
+			nfs_update_delegated_mtime(new_dir);
 		} else
 			nfs4_update_changeattr(old_dir, &res->old_cinfo,
 					res->old_fattr->time_start,
Signature · 1 line
2.52.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Olga Kornievskaia

Since commit 6f9bda2337f8 ("NFS: Fix directory delegation verifier checks") xfstest generic/309 is failing because after the rename (mv) operation, client's mtime/ctime is the same. Update the delegated mtime when directory delegations are present in rename.

Fixes 6f9bda2337f8 ("NFS: Fix directory delegation verifier checks")

Ben