8000 make nfs_atomic_open() call d_drop() on all ->open_context() errors. · bsd-unix/linux@d20cb71 · GitHub
[go: up one dir, main page]

Skip to content

Commit d20cb71

Browse files
Al Viroamschuma-ntap
authored andcommitted
make nfs_atomic_open() call d_drop() on all ->open_context() errors.
In "NFSv4: Move dentry instantiation into the NFSv4-specific atomic open code" unconditional d_drop() after the ->open_context() had been removed. It had been correct for success cases (there ->open_context() itself had been doing dcache manipulations), but not for error ones. Only one of those (ENOENT) got a compensatory d_drop() added in that commit, but in fact it should've been done for all errors. As it is, the case of O_CREAT non-exclusive open on a hashed negative dentry racing with e.g. symlink creation from another client ended up with ->open_context() getting an error and proceeding to call nfs_lookup(). On a hashed dentry, which would've instantly triggered BUG_ON() in d_materialise_unique() (or, these days, its equivalent in d_splice_alias()). Cc: stable@vger.kernel.org # v3.10+ Tested-by: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
1 parent 1b982ea commit d20cb71

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/nfs/dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1539,9 +1539,9 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
15391539
err = PTR_ERR(inode);
15401540
trace_nfs_atomic_open_exit(dir, ctx, open_flags, err);
15411541
put_nfs_open_context(ctx);
1542+
d_drop(dentry);
15421543
switch (err) {
15431544
case -ENOENT:
1544-
d_drop(dentry);
15451545
d_add(dentry, NULL);
15461546
nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
15471547
break;

0 commit comments

Comments
 (0)
0