diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-12 15:51:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-12 15:51:26 -0700 |
commit | 807f030b44ccbb26a346df6f6438628315d9ad98 (patch) | |
tree | 5c5bf61456bf8f6649fab5e60e8ef0e8985a713a /fs/cifs | |
parent | 3cc6e2c599cdca573a8f347aea5da4c855ff5a78 (diff) | |
parent | d9a9f4849fe0c9d560851ab22a85a666cddfdd24 (diff) |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"A couple of fixes for old crap in ->atomic_open() instances"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
cifs_atomic_open(): fix double-put on late allocation failure
gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache
Diffstat (limited to 'fs/cifs')
-rw-r--r-- | fs/cifs/dir.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 0ef099442f20..36e7b2fd2190 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -555,7 +555,6 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, if (server->ops->close) server->ops->close(xid, tcon, &fid); cifs_del_pending_open(&open); - fput(file); rc = -ENOMEM; } |