Commit 4fa7ab8d authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Trond Myklebust
Browse files

NFS: fix RENAME attr in presence of directory delegations



Since commit 6f9bda23 ("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: 6f9bda23 ("NFS: Fix directory delegation verifier checks")
Signed-off-by: default avatarOlga Kornievskaia <okorniev@redhat.com>
Reviewed-by: default avatarBenjamin Coddington <bcodding@hammerspace.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 94545ffc
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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);
}

+1 −0
Original line number Diff line number Diff line
@@ -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,