]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 10 Mar 2020 13:31:41 +0000 (09:31 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 12 Mar 2020 22:21:24 +0000 (18:21 -0400)
with the way fs/namei.c:do_last() had been done, ->atomic_open()
instances needed to recognize the case when existing file got
found with O_EXCL|O_CREAT, either by falling back to finish_no_open()
or failing themselves.  gfs2 one didn't.

Fixes: 6d4ade986f9c (GFS2: Add atomic_open support)
Cc: stable@kernel.org # v3.11
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/gfs2/inode.c

index 2716d56ed0a07e537935c371e19c21c8f986670a..8294851a9dd99acbd548579a38f5cab5745bafd8 100644 (file)
@@ -1248,7 +1248,7 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry,
                if (!(file->f_mode & FMODE_OPENED))
                        return finish_no_open(file, d);
                dput(d);
-               return 0;
+               return excl && (flags & O_CREAT) ? -EEXIST : 0;
        }
 
        BUG_ON(d != NULL);