NFSv2/v3: Fix error handling in nfs_atomic_open_v23()

[ Upstream commit 85d2c2392ac6348e1171d627497034a341a250c1 ]

When nfs_do_create() returns an EEXIST error, it means that a regular
file could not be created. That could mean that a symlink needs to be
resolved. If that's the case, a lookup needs to be kicked off.

Reported-by: Stephen Abbene <sabbene87@gmail.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=220710
Fixes: 7c6c5249f061 ("NFS: add atomic_open for NFSv3 to handle O_TRUNC correctly.")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index c8dd1d0b8d85003d86f5018f4c6db1bdd56b46f0..82ef36cc9ceecfe442f041cac9f2fbd6028fbc84 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2270,11 +2270,12 @@ int nfs_atomic_open_v23(struct inode *dir, struct dentry *dentry,
                return -ENAMETOOLONG;
 
        if (open_flags & O_CREAT) {
-               file->f_mode |= FMODE_CREATED;
                error = nfs_do_create(dir, dentry, mode, open_flags);
-               if (error)
+               if (!error) {
+                       file->f_mode |= FMODE_CREATED;
+                       return finish_open(file, dentry, NULL);
+               } else if (error != -EEXIST || open_flags & O_EXCL)
                        return error;
-               return finish_open(file, dentry, NULL);
        }
        if (d_in_lookup(dentry)) {
                /* The only flags nfs_lookup considers are