diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-19 04:22:22 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-19 04:22:22 +0400 |
| commit | 3fe03debfc58aba8f5ddb32abd7343237d07714c (patch) | |
| tree | f17d2fbf390810404f5d28f45ed5b379fa13c6ef /fs/cifs | |
| parent | 9baa5059485d6559081d27d9b1fe1714f3fccab1 (diff) | |
| parent | 8061a6fa564fe0e71601632758b78d2ba737663c (diff) | |
| download | linux-3fe03debfc58aba8f5ddb32abd7343237d07714c.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"atomic_open-related fixes (Miklos' series, with EEXIST-related parts
replaced with fix in fs/namei.c:atomic_open() instead of messing with
the instances) + race fix in autofs + leak on failure exit in 9p"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
9p: don't forget to destroy inode cache if fscache registration fails
atomic_open: take care of EEXIST in no-open case with O_CREAT|O_EXCL in fs/namei.c
vfs: don't set FILE_CREATED before calling ->atomic_open()
nfs: set FILE_CREATED
gfs2: set FILE_CREATED
cifs: fix filp leak in cifs_atomic_open()
vfs: improve i_op->atomic_open() documentation
autofs4: close the races around autofs4_notify_daemon()
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/dir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index d3e2eaa503a6..5384c2a640ca 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -500,6 +500,7 @@ 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; } |