NFS: Initialise verifiers for visible dentries in nfs_atomic_open()

[ Upstream commit 518c32a1bc4f8df1a8442ee8cdfea3e2fcff20a0 ]

Ensure that the verifiers are initialised before calling
d_splice_alias() in nfs_atomic_open().

Reported-by: Michael Stoler <michael.stoler@vastdata.com>
Fixes: 809fd143de88 ("NFSv4: Ensure nfs_atomic_open set the dentry verifier on ENOENT")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index dc0c50b97643b2f63fb7556729184df6db9006dc..6dd56841feab9648a449d04462259e439836f870 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1960,12 +1960,12 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
                d_drop(dentry);
                switch (err) {
                case -ENOENT:
-                       d_splice_alias(NULL, dentry);
                        if (nfs_server_capable(dir, NFS_CAP_CASE_INSENSITIVE))
                                dir_verifier = inode_peek_iversion_raw(dir);
                        else
                                dir_verifier = nfs_save_change_attribute(dir);
                        nfs_set_verifier(dentry, dir_verifier);
+                       d_splice_alias(NULL, dentry);
                        break;
                case -EISDIR:
                case -ENOTDIR: